Upgrade sdks and migrate to gradle libs

Simon Schubert · Simon Schubert · commit 526c9d117ca9 · 2024-09-01T00:07:15.000+02:00
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "com.inspiredandroid.linuxcommandbibliotheca"
@@ -12,23 +13,23 @@ repositories {
 
 dependencies {
     implementation(project(":common"))
-    implementation("androidx.activity:activity-compose:1.8.1")
-    implementation("androidx.compose.material:material:1.5.4")
-    implementation("androidx.navigation:navigation-compose:2.7.5")
-    implementation("com.google.accompanist:accompanist-appcompat-theme:0.32.0")
-    implementation("com.google.accompanist:accompanist-systemuicontroller:0.32.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
-    implementation("androidx.preference:preference:1.2.1")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.5.4")
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.material)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.accompanist.appcompat.theme)
+    implementation(libs.accompanist.systemuicontroller)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.preference)
+    implementation(libs.androidx.ui.tooling.preview)
 
-    implementation("io.insert-koin:koin-core:3.5.0")
-    implementation("io.insert-koin:koin-android:3.5.0")
-    implementation("io.insert-koin:koin-androidx-compose:3.5.0")
-    implementation("androidx.compose.foundation:foundation:1.5.4")
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.androidx.compose)
+    implementation(libs.androidx.foundation)
 
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.5.4")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:1.5.4")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.5.4")
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.test.manifest)
+    debugImplementation(libs.androidx.ui.tooling)
 }
 
 android {
@@ -62,7 +63,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.6"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 
     compileOptions {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
     id("com.github.ben-manes.versions") version "0.50.0"
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 buildscript {
@@ -11,9 +12,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
-        classpath("com.android.tools.build:gradle:8.2.0")
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
+        classpath(libs.kotlin.gradle.plugin)
+        classpath(libs.gradle)
+        classpath(libs.gradle.plugin)
     }
 }
 
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
@@ -7,7 +7,7 @@ version = parent!!.version
 
 dependencies {
     implementation(project(":common"))
-    implementation("com.squareup.sqldelight:sqlite-driver:1.5.5")
+    implementation(libs.sqldelight.sqlite.driver)
 }
 
 kotlin {
diff --git a/cli/src/jvmMain/resources/application.properties b/cli/src/jvmMain/resources/application.properties
diff --git a/cli/src/main/resources/application.properties b/cli/src/main/resources/application.properties
@@ -0,0 +1 @@
+version=3.2.4
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -28,12 +28,12 @@ kotlin {
         }
         androidMain {
             dependencies {
-                implementation("com.squareup.sqldelight:android-driver:1.5.5")
+                implementation(libs.sqldelight.android.driver)
             }
         }
         jvmMain {
             dependencies {
-                implementation("com.squareup.sqldelight:sqlite-driver:1.5.5")
+                implementation(libs.sqldelight.sqlite.driver)
             }
         }
     }
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -7,10 +7,10 @@ version = "1.0"
 
 dependencies {
     implementation(project(":common"))
-    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.9.1")
-    implementation("org.json:json:20231013")
-    implementation("com.squareup.sqldelight:sqlite-driver:1.5.5")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation(libs.kotlinx.html.jvm)
+    implementation(libs.json)
+    implementation(libs.sqldelight.sqlite.driver)
+    implementation(libs.kotlinx.coroutines.core)
 }
 
 kotlin {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,50 @@
+[versions]
+kotlin = "2.0.20"
+accompanistAppcompatTheme = "0.34.0"
+activityCompose = "1.9.1"
+androidDriver = "1.5.5"
+foundation = "1.6.8"
+gradle = "8.6.0"
+gradlePlugin = "1.5.5"
+json = "20240303"
+koinCore = "3.5.6"
+kotlinGradlePlugin = "2.0.20"
+kotlinxCoroutinesCore = "1.8.1"
+kotlinxHtmlJvm = "0.11.0"
+lifecycleViewmodelCompose = "2.8.4"
+material = "1.6.8"
+navigationCompose = "2.7.7"
+preference = "1.2.1"
+sqliteDriver = "1.5.5"
+uiToolingPreview = "1.6.8"
+
+
+[libraries]
+accompanist-appcompat-theme = { module = "com.google.accompanist:accompanist-appcompat-theme", version.ref = "accompanistAppcompatTheme" }
+accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanistAppcompatTheme" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
+androidx-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundation" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
+androidx-material = { module = "androidx.compose.material:material", version.ref = "material" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
+androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
+androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "uiToolingPreview" }
+androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "uiToolingPreview" }
+androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "uiToolingPreview" }
+androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+gradle-plugin = { module = "com.squareup.sqldelight:gradle-plugin", version.ref = "gradlePlugin" }
+json = { module = "org.json:json", version.ref = "json" }
+koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinCore" }
+koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCore" }
+koin-core = { module = "io.insert-koin:koin-core", version.ref = "koinCore" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-html-jvm = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinxHtmlJvm" }
+sqldelight-android-driver = { module = "com.squareup.sqldelight:android-driver", version.ref = "androidDriver" }
+sqldelight-sqlite-driver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqliteDriver" }
+
+
+[plugins]
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
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-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        kotlin("multiplatform") version "1.9.21"
+        kotlin("multiplatform") version "2.0.20"
     }
 }
 rootProject.name = "Linux Command Library"

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`id("com.github.ben-manes.versions") version "0.50.0"`
	`5`	`+ alias(libs.plugins.compose.compiler) apply false`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`buildscript {`
`@@ -11,9 +12,9 @@ buildscript {`
`11`	`12`	`mavenCentral()`
`12`	`13`	`}`
`13`	`14`	`dependencies {`
`14`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")`
`15`		`- classpath("com.android.tools.build:gradle:8.2.0")`
`16`		`- classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")`
	`15`	`+ classpath(libs.kotlin.gradle.plugin)`
	`16`	`+ classpath(libs.gradle)`
	`17`	`+ classpath(libs.gradle.plugin)`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ version = parent!!.version`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation(project(":common"))`
`10`		`- implementation("com.squareup.sqldelight:sqlite-driver:1.5.5")`
	`10`	`+ implementation(libs.sqldelight.sqlite.driver)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ kotlin {`
`28`	`28`	`}`
`29`	`29`	`androidMain {`
`30`	`30`	`dependencies {`
`31`		`- implementation("com.squareup.sqldelight:android-driver:1.5.5")`
	`31`	`+ implementation(libs.sqldelight.android.driver)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`jvmMain {`
`35`	`35`	`dependencies {`
`36`		`- implementation("com.squareup.sqldelight:sqlite-driver:1.5.5")`
	`36`	`+ implementation(libs.sqldelight.sqlite.driver)`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pluginManagement {`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`	`plugins {`
`8`		`- kotlin("multiplatform") version "1.9.21"`
	`8`	`+ kotlin("multiplatform") version "2.0.20"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`rootProject.name = "Linux Command Library"`