chore: migrate to version catalog, Gropify

fankes · fankes · commit 8eb1532ce114 · 2025-11-11T17:50:47.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -45,9 +45,11 @@
 
 # Kotlin
 .kotlin
+.idea/kotlinc.xml
 
 # Misc
 .idea/misc.xml
+.idea/markdown.xml
 
 # CMake
 cmake-build-*/
@@ -91,6 +93,8 @@ fabric.properties
 .idea/androidTestResultsUserPreferences.xml
 
 # Android projects
+.idea/AndroidProjectSystem.xml
+.idea/deviceManager.xml
 **/local.properties
 /captures
 .externalNativeBuild
@@ -106,5 +110,11 @@ site
 *.bak
 .idea/appInsightsSettings.xml
 
+# Discord plugin for IntelliJ
+.idea/discord.xml
+
+# Copilot for IntelliJ
+.idea/copilot**
+
 # Mac OS
 .DS_Store
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
-    autowire(libs.plugins.kotlin.jvm) apply false
-    autowire(libs.plugins.kotlin.dokka) apply false
-    autowire(libs.plugins.maven.publish) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.dokka) apply false
+    alias(libs.plugins.maven.publish) apply false
 }
 
 libraryProjects {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,14 @@
+[versions]
+kotlin = "2.0.10"
+dokka = "1.9.20"
+maven-publish = "0.34.0"
+slf4j = "2.0.17"
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
+
+[libraries]
+slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml
diff --git a/kavaref-android-stub/build.gradle.kts b/kavaref-android-stub/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("java")
 }
 
-group = property.project.groupName
+group = gropify.project.groupName
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
diff --git a/kavaref-core/build.gradle.kts b/kavaref-core/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    autowire(libs.plugins.kotlin.jvm)
-    autowire(libs.plugins.kotlin.dokka)
-    autowire(libs.plugins.maven.publish)
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.dokka)
+    alias(libs.plugins.maven.publish)
 }
 
-group = property.project.groupName
-version = property.project.kavaref.core.version
+group = gropify.project.groupName
+version = gropify.project.kavaref.core.version
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
@@ -30,5 +30,5 @@ dependencies {
     compileOnly(projects.kavarefAndroidStub)
 
     implementation(projects.kavarefExtension)
-    implementation(org.slf4j.slf4j.api)
+    implementation(libs.slf4j.api)
 }
diff --git a/kavaref-extension/build.gradle.kts b/kavaref-extension/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    autowire(libs.plugins.kotlin.jvm)
-    autowire(libs.plugins.kotlin.dokka)
-    autowire(libs.plugins.maven.publish)
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.dokka)
+    alias(libs.plugins.maven.publish)
 }
 
-group = property.project.groupName
-version = property.project.kavaref.extension.version
+group = gropify.project.groupName
+version = gropify.project.kavaref.extension.version
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
diff --git a/samples/kavaref-demo/build.gradle.kts b/samples/kavaref-demo/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
-    autowire(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.jvm)
 }
 
-group = property.project.samples.kavaref.demo.groupName
-version = property.project.samples.kavaref.demo.version
+group = gropify.project.samples.kavaref.demo.groupName
+version = gropify.project.samples.kavaref.demo.version
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
@@ -27,5 +27,5 @@ dependencies {
     implementation(projects.kavarefExtension)
 
     // SLF4J Simple Logger
-    implementation(org.slf4j.slf4j.simple)
+    implementation(libs.slf4j.simple)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,29 +8,32 @@ pluginManagement {
     }
 }
 
-plugins {
-    id("com.highcapable.sweetdependency") version "1.0.4"
-    id("com.highcapable.sweetproperty") version "1.0.8"
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
 }
 
-sweetDependency {
-    isEnableVerboseMode = false
+plugins {
+    id("com.highcapable.gropify") version "1.0.0"
 }
 
-sweetProperty {
+gropify {
     global {
-        sourcesCode {
+        jvm {
             includeKeys(
                 "^project\\..*\$".toRegex(),
                 "^gradle\\..*\$".toRegex()
             )
-            isEnableRestrictedAccess = true
+            isRestrictedAccessEnabled = true
         }
     }
 
     rootProject {
-        all {
-            isEnable = false
+        common {
+            isEnabled = false
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id("java")`
`3`	`3`	`}`
`4`	`4`
`5`		`-group = property.project.groupName`
	`5`	`+group = gropify.project.groupName`
`6`	`6`
`7`	`7`	`java {`
`8`	`8`	`sourceCompatibility = JavaVersion.VERSION_17`
Original file line number	Diff line number	Diff line change
`@@ -8,29 +8,32 @@ pluginManagement {`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`11`		`-plugins {`
`12`		`- id("com.highcapable.sweetdependency") version "1.0.4"`
`13`		`- id("com.highcapable.sweetproperty") version "1.0.8"`
	`11`	`+dependencyResolutionManagement {`
	`12`	`+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)`
	`13`	`+ repositories {`
	`14`	`+ google()`
	`15`	`+ mavenCentral()`
	`16`	`+ }`
`14`	`17`	`}`
`15`	`18`
`16`		`-sweetDependency {`
`17`		`- isEnableVerboseMode = false`
	`19`	`+plugins {`
	`20`	`+ id("com.highcapable.gropify") version "1.0.0"`
`18`	`21`	`}`
`19`	`22`
`20`		`-sweetProperty {`
	`23`	`+gropify {`
`21`	`24`	`global {`
`22`		`- sourcesCode {`
	`25`	`+ jvm {`
`23`	`26`	`includeKeys(`
`24`	`27`	`"^project\\..*\$".toRegex(),`
`25`	`28`	`"^gradle\\..*\$".toRegex()`
`26`	`29`	`)`
`27`		`- isEnableRestrictedAccess = true`
	`30`	`+ isRestrictedAccessEnabled = true`
`28`	`31`	`}`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`rootProject {`
`32`		`- all {`
`33`		`- isEnable = false`
	`35`	`+ common {`
	`36`	`+ isEnabled = false`
`34`	`37`	`}`
`35`	`38`	`}`
`36`	`39`	`}`