chore: update dependencies

adrielcafe · adrielcafe · commit e2030e68a495 · 2023-10-21T16:41:00.000-03:00
diff --git a/android-module.gradle b/android-module.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 31
+    compileSdk 34
     defaultConfig {
         minSdk 21
-        targetSdk 31
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -1,9 +1,7 @@
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
-}
+}
diff --git a/buildSrc/src/main/kotlin/Setup.kt b/buildSrc/src/main/kotlin/Setup.kt
@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import com.android.build.gradle.LibraryExtension
 
 private fun BaseExtension.android() {
-    compileSdkVersion(31)
+    compileSdkVersion(34)
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }
@@ -27,7 +27,7 @@ fun Project.kotlinMultiplatform(
                 explicitApi()
             }
 
-            android {
+            androidTarget {
                 if (project.plugins.hasPlugin("com.vanniktech.maven.publish")) {
                     publishLibraryVariants("release")
                 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,21 @@
 org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
+org.gradle.unsafe.configuration-cache=false
+
+org.jetbrains.compose.experimental.macos.enabled=true
+org.jetbrains.compose.experimental.uikit.enabled=true
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+
 android.useAndroidX=true
 android.enableJetifier=false
-kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig = false
 
-kotlin.native.cacheKind=none
+kotlin.code.style=official
 kotlin.native.useEmbeddableCompilerJar=true
 # Enable kotlin/native experimental memory model
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.binary.memoryModel=experimental
 kotlin.mpp.stability.nowarn=true
-
+kotlin.mpp.androidSourceSetLayoutVersion=2
 # Compose dependencies currently requires to be CompileOny if we want to both
 # support Android only projects and multiplatform projects.
 # based on the issue below, it seems to only have issues with compileOnly
@@ -19,14 +25,6 @@ kotlin.mpp.stability.nowarn=true
 # https://youtrack.jetbrains.com/issue/KT-46377
 kotlin.native.ignoreIncorrectDependencies=true
 
-android.defaults.buildfeatures.buildconfig = false
-
-org.jetbrains.compose.experimental.macos.enabled=true
-org.jetbrains.compose.experimental.uikit.enabled=true
-org.jetbrains.compose.experimental.jscanvas.enabled=true
-
-kotlin.mpp.androidSourceSetLayoutVersion=2
-
 # Maven
 SONATYPE_HOST=S01
 SONATYPE_AUTOMATIC_RELEASE=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-plugin-android = "7.4.2"
-plugin-ktlint = "10.2.1"
+plugin-android = "8.1.2"
+plugin-ktlint = "11.6.1"
 plugin-maven = "0.22.0"
 
-kotlin = "1.8.20"
+kotlin = "1.9.10"
 
-ksp = "1.8.20-1.0.10"
+ksp = "1.9.10-1.0.13"
 caseFormat = "0.2.0"
 konsumeXml = "1.0"
 
-appCompat = "1.4.1"
-compose = "1.3.0"
-composeCompiler = "1.4.5"
-composeActivity = "1.4.0"
-composeMultiplatform = "1.4.0"
+appCompat = "1.6.1"
+compose = "1.5.4"
+composeCompiler = "1.5.3"
+composeActivity = "1.8.0"
+composeMultiplatform = "1.5.3"
 
-test-junit = "1.1.1"
+test-junit = "1.1.5"
 
 [libraries]
 plugin-android = { module = "com.android.tools.build:gradle", version.ref = "plugin-android" }
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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-module.gradle b/kotlin-module.gradle
@@ -2,7 +2,6 @@ apply plugin: 'kotlin'
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
         freeCompilerArgs += '-Xexplicit-api=strict'
     }
 }
diff --git a/lyricist-compose/build.gradle.kts b/lyricist-compose/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
+android {
+    namespace = "cafe.adriel.lyricist"
+}
+
 kotlinMultiplatform()
 
 kotlin {
diff --git a/lyricist-compose/src/androidMain/AndroidManifest.xml b/lyricist-compose/src/androidMain/AndroidManifest.xml
diff --git a/lyricist-core/build.gradle.kts b/lyricist-core/build.gradle.kts
@@ -4,4 +4,8 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
+android {
+    namespace = "cafe.adriel.lyricist.core"
+}
+
 kotlinMultiplatform()
diff --git a/lyricist-core/src/androidMain/AndroidManifest.xml b/lyricist-core/src/androidMain/AndroidManifest.xml
diff --git a/sample-multi-module/build.gradle b/sample-multi-module/build.gradle
@@ -2,6 +2,10 @@ apply plugin: "com.android.library"
 apply plugin: "com.google.devtools.ksp"
 apply from: "../android-module.gradle"
 
+android {
+    namespace "cafe.adriel.lyricist.sample.multimodule"
+}
+
 ksp {
     arg("lyricist.packageName", "cafe.adriel.lyricist.custompackage")
     arg("lyricist.moduleName", "multi-module")
diff --git a/sample-multi-module/src/main/AndroidManifest.xml b/sample-multi-module/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cafe.adriel.lyricist.sample.multimodule">
-
-</manifest>
+<manifest package="cafe.adriel.lyricist.sample.multimodule"/>
diff --git a/sample-multiplatform/build.gradle.kts b/sample-multiplatform/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTask
+
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Deb
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Dmg
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Msi
@@ -29,7 +29,10 @@ kotlin {
             executable {
                 entryPoint = "main"
                 freeCompilerArgs += listOf(
-                    "-linker-option", "-framework", "-linker-option", "Metal"
+                    "-linker-option",
+                    "-framework",
+                    "-linker-option",
+                    "Metal"
                 )
             }
         }
@@ -57,7 +60,6 @@ kotlin {
         binaries.executable()
     }
 
-
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -83,15 +85,14 @@ kotlin {
     }
 }
 
-
 dependencies {
     add("kspCommonMainMetadata", project(":lyricist-processor-compose"))
 }
 
 // workaround for KSP only in Common Main.
 // https://github.com/google/ksp/issues/567
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().all {
-    if(name != "kspCommonMainKotlinMetadata") {
+    if (name != "kspCommonMainKotlinMetadata") {
         dependsOn("kspCommonMainKotlinMetadata")
     }
 }
diff --git a/sample-multiplatform/src/androidMain/AndroidManifest.xml b/sample-multiplatform/src/androidMain/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cafe.adriel.voyager.sample.multiplatform">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:label="Voyager Sample Multiplatform"
diff --git a/sample-xml/build.gradle b/sample-xml/build.gradle
@@ -2,6 +2,10 @@ apply plugin: "com.android.library"
 apply plugin: "com.google.devtools.ksp"
 apply from: "../android-module.gradle"
 
+android {
+    namespace "cafe.adriel.lyricist.sample.xml"
+}
+
 ksp {
     arg("lyricist.xml.moduleName", "xml")
     arg("lyricist.xml.defaultLanguageTag", "en")
diff --git a/sample-xml/src/main/AndroidManifest.xml b/sample-xml/src/main/AndroidManifest.xml
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,9 +3,7 @@ apply plugin: "com.google.devtools.ksp"
 apply from: "../android-module.gradle"
 
 android {
-    defaultConfig {
-        applicationId "cafe.adriel.lyricist.sample"
-    }
+    namespace "cafe.adriel.lyricist.sample"
 }
 
 ksp {
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cafe.adriel.lyricist.sample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:label="@string/app_name"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,4 @@
 dependencyResolutionManagement {
-    //repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
         mavenCentral()
@@ -18,8 +17,6 @@ include(
     ":sample-multiplatform",
 )
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 // There's an issue when a module has the same name of the project
 // https://github.com/gradle/gradle/issues/16608
 //enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-enableFeaturePreview("VERSION_CATALOGS")`
`2`		`-`
`3`	`1`	`dependencyResolutionManagement {`
`4`	`2`	`versionCatalogs {`
`5`	`3`	`create("libs") {`
`6`	`4`	`from(files("../gradle/libs.versions.toml"))`
`7`	`5`	`}`
`8`	`6`	`}`
`9`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`8`	`8`	`import com.android.build.gradle.LibraryExtension`
`9`	`9`
`10`	`10`	`private fun BaseExtension.android() {`
`11`		`- compileSdkVersion(31)`
	`11`	`+ compileSdkVersion(34)`
`12`	`12`	`defaultConfig {`
`13`	`13`	`minSdk = 21`
`14`		`- targetSdk = 31`
	`14`	`+ targetSdk = 34`
`15`	`15`	`versionCode = 1`
`16`	`16`	`versionName = "1.0"`
`17`	`17`	`}`
`@@ -27,7 +27,7 @@ fun Project.kotlinMultiplatform(`
`27`	`27`	`explicitApi()`
`28`	`28`	`}`
`29`	`29`
`30`		`- android {`
	`30`	`+ androidTarget {`
`31`	`31`	`if (project.plugins.hasPlugin("com.vanniktech.maven.publish")) {`
`32`	`32`	`publishLibraryVariants("release")`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ apply plugin: 'kotlin'`
`2`	`2`
`3`	`3`	`compileKotlin {`
`4`	`4`	`kotlinOptions {`
`5`		`- jvmTarget = JavaVersion.VERSION_1_8.toString()`
`6`	`5`	`freeCompilerArgs += '-Xexplicit-api=strict'`
`7`	`6`	`}`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@ plugins {`
`5`	`5`	`id("com.vanniktech.maven.publish")`
`6`	`6`	`}`
`7`	`7`
	`8`	`+android {`
	`9`	`+ namespace = "cafe.adriel.lyricist"`
	`10`	`+}`
	`11`	`+`
`8`	`12`	`kotlinMultiplatform()`
`9`	`13`
`10`	`14`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,8 @@ plugins {`
`4`	`4`	`id("com.vanniktech.maven.publish")`
`5`	`5`	`}`
`6`	`6`
	`7`	`+android {`
	`8`	`+ namespace = "cafe.adriel.lyricist.core"`
	`9`	`+}`
	`10`	`+`
`7`	`11`	`kotlinMultiplatform()`