From 67685c7d571cf9c054b5470704f92af0188e8c97 Mon Sep 17 00:00:00 2001 From: Adam <897017+asemy@users.noreply.github.com> Date: Wed, 8 Dec 2021 21:15:16 +0100 Subject: [PATCH] use kotlin SemVer lib for parsing Factorio version --- buildSrc/build.gradle.kts | 2 ++ modules/events-mod/build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c61dbe9..3a8a465 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -22,6 +22,8 @@ dependencies { implementation("com.github.node-gradle:gradle-node-plugin:3.1.1") + + implementation("net.swiftzer.semver:semver:1.1.2") } val projectJvmTarget = "11" diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts index bdb990c..57747f9 100644 --- a/modules/events-mod/build.gradle.kts +++ b/modules/events-mod/build.gradle.kts @@ -5,7 +5,7 @@ import dev.adamko.kafkatorio.gradle.factorioModAttributes import dev.adamko.kafkatorio.gradle.typescriptAttributes import groovy.json.JsonOutput 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 plugins { @@ -25,7 +25,7 @@ val modName: String by extra("${rootProject.name}-events") 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) -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 projectTokens: MutableMap by rootProject.extra