lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use kotlin SemVer lib for parsing Factorio version

Browse source
This commit is contained in:
Adam 2021-12-08 21:15:16 +01:00
parent 6b63f2ab97
commit 67685c7d57
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildSrc/build.gradle.kts
View file

@ -22,6 +22,8 @@ dependencies {
implementation("com.github.node-gradle:gradle-node-plugin:3.1.1") implementation("com.github.node-gradle:gradle-node-plugin:3.1.1")
implementation("net.swiftzer.semver:semver:1.1.2")
} }
val projectJvmTarget = "11" val projectJvmTarget = "11"

4
modules/events-mod/build.gradle.kts
View file

@ -5,7 +5,7 @@ import dev.adamko.kafkatorio.gradle.factorioModAttributes
import dev.adamko.kafkatorio.gradle.typescriptAttributes import dev.adamko.kafkatorio.gradle.typescriptAttributes
import groovy.json.JsonOutput import groovy.json.JsonOutput
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
import org.jetbrains.kotlin.gradle.targets.js.npm.SemVer import net.swiftzer.semver.SemVer
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins { plugins {
@ -25,7 +25,7 @@ val modName: String by extra("${rootProject.name}-events")
val distributionZipName: String by extra("${modName}_${project.version}.zip") val distributionZipName: String by extra("${modName}_${project.version}.zip")
// version of Factorio that the mod is compatible with (must only be "major.minor" - patch causes error) // version of Factorio that the mod is compatible with (must only be "major.minor" - patch causes error)
val modFactorioCompatibility = SemVer.from(libs.versions.factorio.get()).run { "$major.$minor" } val modFactorioCompatibility = SemVer.parse(libs.versions.factorio.get()).run { "$major.$minor" }
val licenseFile: RegularFile by rootProject.extra val licenseFile: RegularFile by rootProject.extra
val projectTokens: MutableMap<String, String> by rootProject.extra val projectTokens: MutableMap<String, String> by rootProject.extra