Use central file for managing versions

jakobkmar · jakobkmar · commit 0581166fec82 · 2024-05-09T04:35:57.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("com.google.devtools.ksp") version "1.7.10-1.0.6" apply false
-    id("org.jetbrains.compose") version "1.2.0-beta01" apply false
+    id(Deps.Ksp.plugin) version Deps.Ksp.version apply false
+    id("org.jetbrains.compose") version Deps.Compose.version apply false
     id("org.jetbrains.dokka")
 }
 
@@ -18,15 +18,15 @@ allprojects {
     group = "net.silkmc"
     version = "1.0.4"
 
-    description = "Silk Compose brings Kotlin compose-jb to Minecraft"
+    description = "Silk Compose brings Kotlin Compose Multiplatform to Minecraft"
 
     tasks {
         withType<JavaCompile> {
-            options.release.set(17)
+            options.release.set(21)
         }
         withType<KotlinCompile> {
             kotlinOptions {
-                jvmTarget = "17"
+                jvmTarget = "21"
                 freeCompilerArgs += listOf("-Xcontext-receivers", "-Xskip-prerelease-check")
             }
         }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -17,20 +17,18 @@ repositories {
 dependencies {
     fun pluginDep(id: String, version: String) = "${id}:${id}.gradle.plugin:${version}"
 
-    val kotlinVersion = "1.7.10"
+    val kotlinVersion = "1.9.23"
 
     compileOnly(kotlin("gradle-plugin", embeddedKotlinVersion))
     runtimeOnly(kotlin("gradle-plugin", kotlinVersion))
     compileOnly(pluginDep("org.jetbrains.kotlin.plugin.serialization", embeddedKotlinVersion))
     runtimeOnly(pluginDep("org.jetbrains.kotlin.plugin.serialization", kotlinVersion))
 
-    implementation(pluginDep("fabric-loom", "0.13-SNAPSHOT"))
-    implementation(pluginDep("io.github.juuxel.loom-quiltflower", "1.7.3"))
-    implementation(pluginDep("com.matthewprenger.cursegradle", "1.4.0"))
-    implementation(pluginDep("com.modrinth.minotaur", "2.3.1"))
+    implementation(pluginDep("fabric-loom", "1.6-SNAPSHOT"))
+    implementation(pluginDep("com.modrinth.minotaur", "2.8.7"))
 
-    val compileDokkaVersion = "1.7.0"
-    val dokkaVersion = "1.7.10"
+    val compileDokkaVersion = "1.9.20"
+    val dokkaVersion = "1.9.20"
 
     compileOnly("org.jetbrains.dokka:dokka-gradle-plugin:$compileDokkaVersion")
     runtimeOnly("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion")
diff --git a/buildSrc/src/main/kotlin/BuildConstants.kt b/buildSrc/src/main/kotlin/BuildConstants.kt
@@ -1,2 +1,63 @@
 val githubRepo = "SilkMC/silk-compose"
-val minecraftVersion = "1.19.2"
+val minecraftVersion = "1.20.6"
+
+object Deps {
+    // https://fabricmc.net/develop/
+    // https://jakobk.net/mcdev
+    object Fabric {
+        val minecraft = "com.mojang:minecraft:$minecraftVersion"
+        val loader = "net.fabricmc:fabric-loader:0.15.10"
+        val kotlin = "net.fabricmc:fabric-language-kotlin:1.10.19+kotlin.1.9.23"
+    }
+
+    // https://github.com/SilkMC/silk
+    object Silk {
+        val silkVersion = "1.10.5"
+        val core = "net.silkmc:silk-core:$silkVersion"
+        val commands = "net.silkmc:silk-commands:$silkVersion"
+    }
+
+    object KotlinX {
+        // https://github.com/Kotlin/multik
+        object MultiK {
+            val version = "0.2.3"
+            val jvm = "org.jetbrains.kotlinx:multik-default-jvm:$version"
+        }
+        // https://github.com/Kotlin/kotlinx.serialization
+        object Serialization {
+            val version = "1.6.3"
+            val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:$version"
+        }
+    }
+
+    // https://github.com/JetBrains/compose-multiplatform
+    object Compose {
+        val version = "1.6.10-rc01"
+    }
+
+    // https://github.com/ajalt/colormath
+    object ColorMath {
+        val version = "3.5.0"
+        val jvm = "com.github.ajalt.colormath:colormath-jvm:$version"
+    }
+
+    // https://github.com/google/ksp
+    object Ksp {
+        val version = "1.9.23-1.0.20"
+        val plugin = "com.google.devtools.ksp"
+        val symbolProcessingApi = "com.google.devtools.ksp:symbol-processing-api:$version"
+        // https://square.github.io/kotlinpoet/interop-ksp/
+        val kotlinPoetExtension = "com.squareup:kotlinpoet-ksp:1.16.0"
+    }
+
+    object Logging {
+        // https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
+        val slf4jSimple = "org.slf4j:slf4j-simple:1.7.36"
+    }
+
+    // https://github.com/godaddy/compose-color-picker
+    object ColorPicker {
+        val version = "0.7.0"
+        val jvm = "com.godaddy.android.colorpicker:compose-color-picker-jvm:$version"
+    }
+}
diff --git a/buildSrc/src/main/kotlin/mod-build-script.gradle.kts b/buildSrc/src/main/kotlin/mod-build-script.gradle.kts
@@ -6,12 +6,14 @@ plugins {
 val excludedDeps: Configuration by configurations.creating
 
 dependencies {
-    minecraft("com.mojang:minecraft:$minecraftVersion")
+    minecraft(Deps.Fabric.minecraft)
     mappings(loom.layered {
-        //mappings("net.fabricmc:yarn:1.19+build.4")
         officialMojangMappings()
     })
-    excludedDeps(modImplementation("net.fabricmc:fabric-loader:0.14.9")!!)
-    excludedDeps(modImplementation("net.fabricmc.fabric-api:fabric-api:0.60.0+1.19.2")!!)
-    excludedDeps(modImplementation("net.fabricmc:fabric-language-kotlin:1.8.3+kotlin.1.7.10")!!)
+    excludedDeps(modImplementation(Deps.Fabric.loader)!!)
+    excludedDeps(modImplementation(Deps.Fabric.kotlin)!!)
+}
+
+configurations.namedElements {
+    attributes.attribute(Attribute.of("temp_disambiguation", String::class.java), "temp_value")
 }
diff --git a/buildSrc/src/main/kotlin/mod-upload-script.gradle.kts b/buildSrc/src/main/kotlin/mod-upload-script.gradle.kts
@@ -1,5 +1,3 @@
-import com.modrinth.minotaur.TaskModrinthSyncBody
-import com.modrinth.minotaur.TaskModrinthUpload
 import com.modrinth.minotaur.dependencies.DependencyType
 import com.modrinth.minotaur.dependencies.ModDependency
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,8 +6,6 @@ pluginManagement {
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         maven("https://maven.fabricmc.net/")
-        maven("https://server.bbkr.space/artifactory/libs-release/")
-        maven("https://maven.quiltmc.org/repository/release/")
     }
 }
 
diff --git a/silk-compose-ksp/build.gradle.kts b/silk-compose-ksp/build.gradle.kts
@@ -4,8 +4,9 @@ plugins {
 }
 
 dependencies {
-    implementation("com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6")
-    implementation("com.squareup:kotlinpoet-ksp:1.12.0")
     implementation(project(":${rootProject.name}-mojang-api"))
-    implementation("org.slf4j:slf4j-simple:1.7.36")
+
+    implementation(Deps.Ksp.symbolProcessingApi)
+    implementation(Deps.Ksp.kotlinPoetExtension)
+    implementation(Deps.Logging.slf4jSimple)
 }
diff --git a/silk-compose-mojang-api/build.gradle.kts b/silk-compose-mojang-api/build.gradle.kts
@@ -7,5 +7,5 @@ description = "Silk Compose Mojang API extracts Minecraft assets from the client
 
 dependencies {
     implementation(kotlin("stdlib"))
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation(Deps.KotlinX.Serialization.json)
 }
diff --git a/silk-compose-testmod/build.gradle.kts b/silk-compose-testmod/build.gradle.kts
@@ -7,7 +7,8 @@ description = "Testmod for Silk Compose"
 
 dependencies {
     implementation(project(":${rootProject.name}", configuration = "developmentElements"))
-    modImplementation("net.silkmc:silk-commands:1.9.2")
+    modImplementation(Deps.Silk.commands)
 
-    implementation("com.godaddy.android.colorpicker:compose-color-picker-jvm:0.5.0")
+    implementation(Deps.ColorMath.jvm)
+    implementation(Deps.ColorPicker.jvm)
 }
diff --git a/silk-compose/build.gradle.kts b/silk-compose/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     `project-publish-script`
     `mod-upload-script`
     `dokka-script`
-    id("com.google.devtools.ksp")
+    id(Deps.Ksp.plugin)
     id("org.jetbrains.compose")
 }
 
@@ -18,35 +18,43 @@ val excludedDeps: Configuration by configurations.getting
 // adding compileOnly here is a workaround for a different issue where includes won't get loaded
 configurations {
     register("developmentElements") {
-        extendsFrom(implementation.get(), namedElements.get(), api.get(), compileOnly.get())
+        extendsFrom(namedElements.get(), implementation.get(), api.get(), compileOnly.get())
     }
 }
 
 dependencies {
     ksp(project(":${rootProject.name}-ksp"))
     include(compileOnly(project(":${rootProject.name}-mojang-api"))!!)
 
-    modApi("net.silkmc:silk-core:1.9.2")
+    modApi(Deps.Silk.core)
 
-    includeTransitive(implementation("org.jetbrains.kotlinx:multik-default-jvm:0.2.0")!!)
-    includeTransitive(implementation("com.github.ajalt.colormath:colormath-jvm:3.2.0")!!)
+    includeTransitive(implementation(Deps.KotlinX.MultiK.jvm)!!)
+    includeTransitive(implementation(Deps.ColorMath.jvm)!!)
 
-    includeTransitive(api(compose.desktop.common)!!)
-    @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-    includeTransitive(api(compose.material3)!!)
+    listOf(
+        compose.desktop.common,
+        compose.material3,
+    ).forEach {
+        includeTransitive(api(it)!!)
+    }
 
-    includeTransitive(implementation(compose.desktop.linux_x64)!!)
-    includeTransitive(implementation(compose.desktop.linux_arm64)!!)
-    includeTransitive(implementation(compose.desktop.windows_x64)!!)
-    includeTransitive(implementation(compose.desktop.macos_x64)!!)
-    includeTransitive(implementation(compose.desktop.macos_arm64)!!)
+    listOf(
+        compose.desktop.linux_x64,
+        compose.desktop.linux_arm64,
+        compose.desktop.windows_x64,
+        compose.desktop.macos_x64,
+        compose.desktop.macos_arm64,
+    ).forEach {
+        includeTransitive(implementation(it)!!)
+    }
 
     val excludedModules = excludedDeps.resolvedConfiguration.resolvedArtifacts
         .map { it.moduleVersion.id.run { group to name } }
 
     includeTransitive.resolvedConfiguration.resolvedArtifacts.forEach {
         val id = it.moduleVersion.id
         if (!excludedModules.contains(id.group to id.name)) {
+            println("Including $id")
             include(id.toString())
         }
     }
@@ -69,7 +77,7 @@ tasks {
 }
 
 ksp {
-    arg("minecraft-version", "1.19")
+    arg("minecraft-version", minecraftVersion)
 }
 
 kotlin {
diff --git a/silk-compose/docs/Module.md b/silk-compose/docs/Module.md
@@ -44,7 +44,7 @@ You can now have a look at the **UI** package (below) to see custom composable f
 ## Compose docs
 
 There are docs at [Android Developer Website](https://developer.android.com/jetpack/compose/documentation) and you can
-find desktop specific documentation at the [compose-jb](https://github.com/JetBrains/compose-jb) repository.
+find desktop specific documentation at the [Compose Multiplatform](https://github.com/JetBrains/compose-multiplatform) repository.
 Additionally, there is a  [community maintained playground](https://foso.github.io/Jetpack-Compose-Playground/).
 For each Compose module, you can also find very useful API docs, e.g.
 [the ones for Material 3](https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary).

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import com.modrinth.minotaur.TaskModrinthSyncBody`
`2`		`-import com.modrinth.minotaur.TaskModrinthUpload`
`3`	`1`	`import com.modrinth.minotaur.dependencies.DependencyType`
`4`	`2`	`import com.modrinth.minotaur.dependencies.ModDependency`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ pluginManagement {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")`
`8`	`8`	`maven("https://maven.fabricmc.net/")`
`9`		`- maven("https://server.bbkr.space/artifactory/libs-release/")`
`10`		`- maven("https://maven.quiltmc.org/repository/release/")`
`11`	`9`	`}`
`12`	`10`	`}`
`13`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- implementation("com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6")`
`8`		`- implementation("com.squareup:kotlinpoet-ksp:1.12.0")`
`9`	`7`	`implementation(project(":${rootProject.name}-mojang-api"))`
`10`		`- implementation("org.slf4j:slf4j-simple:1.7.36")`
	`8`	`+`
	`9`	`+ implementation(Deps.Ksp.symbolProcessingApi)`
	`10`	`+ implementation(Deps.Ksp.kotlinPoetExtension)`
	`11`	`+ implementation(Deps.Logging.slf4jSimple)`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ description = "Silk Compose Mojang API extracts Minecraft assets from the client`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation(kotlin("stdlib"))`
`10`		`- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")`
	`10`	`+ implementation(Deps.KotlinX.Serialization.json)`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ description = "Testmod for Silk Compose"`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation(project(":${rootProject.name}", configuration = "developmentElements"))`
`10`		`- modImplementation("net.silkmc:silk-commands:1.9.2")`
	`10`	`+ modImplementation(Deps.Silk.commands)`
`11`	`11`
`12`		`- implementation("com.godaddy.android.colorpicker:compose-color-picker-jvm:0.5.0")`
	`12`	`+ implementation(Deps.ColorMath.jvm)`
	`13`	`+ implementation(Deps.ColorPicker.jvm)`
`13`	`14`	`}`