Merge pull request #160 from InfernalSuite/develop

Properly bump API version

Author: b0ykoe

buildSrc/build.gradle.kts

@@ -18,7 +18,7 @@ fun convertPlugin(plugin: Provider<PluginDependency>): String {
 dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
     implementation(convertPlugin(libs.plugins.blossom))
-    implementation(convertPlugin(libs.plugins.gitprops))
+    implementation(convertPlugin(libs.plugins.indragit))
     implementation(convertPlugin(libs.plugins.profiles))
     implementation(convertPlugin(libs.plugins.kotlin.jvm))
     implementation(convertPlugin(libs.plugins.lombok))

buildSrc/src/main/kotlin/asp.base-conventions.gradle.kts

@@ -1,6 +1,8 @@
+import net.kyori.indra.git.IndraGitExtension
+
 plugins {
     `java-library`
-    id("com.gorylenko.gradle-git-properties")
+    id("net.kyori.indra.git")
 }
 
 group = rootProject.providers.gradleProperty("group").get()
@@ -43,16 +45,10 @@ tasks {
             .tags("apiNote:a:API Note", "implSpec:a:Implementation Requirements", "implNote:a:Implementation Note")
     }
 
-    val git = withType<com.gorylenko.GenerateGitPropertiesTask> {
-        outputs.upToDateWhen { false }
-        gitProperties.extProperty = "git"
-    }.first()
-
     processResources {
         filteringCharset = Charsets.UTF_8.name()
-        dependsOn(git)
         filesMatching(listOf("paper-plugin.yml", "version.txt")) {
-            expand("gitCommitId" to git.generatedProperties["git.commit.id"])
+            expand("gitCommitId" to (project.the<IndraGitExtension>().commit()?.name ?: "unknown"))
         }
     }
 }

buildSrc/src/main/kotlin/asp.internal-conventions.gradle.kts

@@ -0,0 +1,8 @@
+import net.kyori.indra.git.IndraGitExtension
+import org.gradle.kotlin.dsl.the
+
+plugins {
+    id("net.kyori.indra.git")
+}
+
+version = "${rootProject.providers.gradleProperty("apiVersion").get()}-${the<IndraGitExtension>().commit()?.name ?: "SNAPSHOT"}"

buildSrc/src/main/kotlin/asp.publishing-conventions.gradle.kts

@@ -69,7 +69,13 @@ extensions.configure<ProfilesExtension>("profiles") {
                 repositories {
                     maven {
                         name = "infernalsuite"
-                        url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
+
+                        url = if("${project.version}".endsWith("-SNAPSHOT")) {
+                            uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
+                        } else {
+                            uri("https://repo.infernalsuite.com/repository/maven-releases/")
+                        }
+
                         credentials {
                             username = project.property("ISUsername") as String?
                             password = project.property("ISPassword") as String?

core/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("asp.base-conventions")
+    id("asp.internal-conventions")
     id("asp.publishing-conventions")
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 group=com.infernalsuite.asp
-apiVersion=4.0.0-SNAPSHOT
+apiVersion=4.0.0
 version=1.21.4-R0.1-SNAPSHOT
 
 mcVersion=1.21.4

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ bstats = "3.1.0"
 cloud-core = "2.0.0"
 cloud-minecraft = "2.0.0-beta.10"
 configurate = "4.1.2"
-gradle-git-properties = "2.4.2"
+indra-git = "3.1.3"
 gradle-profiles = "0.54.0"
 hikari = "6.2.1"
 kotlin = "1.9.25"
@@ -23,7 +23,7 @@ zstd = "1.5.6-8"
 
 [plugins]
 blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
-gitprops = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradle-git-properties" }
+indragit = { id = "net.kyori.indra.git", version.ref = "indra-git" }
 profiles = { id = "org.kordamp.gradle.profiles", version.ref = "gradle-profiles" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 lombok = { id = "io.freefair.lombok", version.ref = "lombok-plugin" }