v0.45-beta-2

xzel23 · Nov 12, 2024 · e6be69c · e6be69c
1 parent ad60db9
commit e6be69c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -47,6 +47,7 @@ object Meta {
 
 subprojects {
     project.version = rootProject.libs.versions.projectVersion.get()
+
     fun isDevelopmentVersion(versionString : String) : Boolean {
         val v = versionString.toDefaultLowerCase()
         val markers = listOf("snapshot", "alpha", "beta")
@@ -58,6 +59,7 @@ subprojects {
         return false
     }
     val isReleaseVersion = !isDevelopmentVersion(project.version.toString())
+    val isSnapshot = project.version.toString().toDefaultLowerCase().contains("snapshot")
 
     apply(plugin = "java-library")
     apply(plugin = "jvm-test-suite")
@@ -189,7 +191,7 @@ subprojects {
             maven {
                 val releaseRepo = URI("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
                 val snapshotRepo = URI("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-                url = if (isReleaseVersion) releaseRepo else snapshotRepo
+                url = if (isSnapshot) snapshotRepo else releaseRepo
                 credentials {
                     username = project.properties["ossrhUsername"].toString()
                     password = project.properties["ossrhPassword"].toString()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,24 +1,18 @@
 import org.gradle.internal.extensions.stdlib.toDefaultLowerCase
 
 rootProject.name = "dua3-fx"
-val projectVersion = "0.45-beta-2-SNAPSHOT"
+val projectVersion = "0.45-beta-2"
 
 include("fx-application")
 include("fx-application:fx-application-fxml")
 
 dependencyResolutionManagement {
 
-    fun isDevelopmentVersion(versionString : String) : Boolean {
-        val v = versionString.toDefaultLowerCase()
-        val markers = listOf("snapshot", "alpha", "beta")
-        for (marker in markers) {
-            if (v.contains("-$marker") || v.contains(".$marker")) {
-                return true
-            }
-        }
-        return false
+    val isSnapshot = projectVersion.toDefaultLowerCase().contains("snapshot")
+
+    if (isSnapshot) {
+        println("SNAPSHOT version detected, using local Maven repository")
     }
-    val isSnapshot = isDevelopmentVersion(projectVersion)
 
     versionCatalogs {
         create("libs") {