From f82576ef3e4e5cc075900aa3d3fa6bc97c12597c Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 18 May 2026 17:16:27 +0300 Subject: [PATCH 1/9] feat(android): improve config --- PaicordKt/build.gradle.kts | 48 ++++++--------- .../llsc12/paicord/ExampleInstrumentedTest.kt | 24 -------- .../com/llsc12/paicord/MainActivity.kt | 9 --- .../com/llsc12/paicord/ui/theme/Color.kt | 0 .../com/llsc12/paicord/ui/theme/Theme.kt | 0 .../com/llsc12/paicord/ui/theme/Type.kt | 0 .../com/llsc12/paicord/ExampleUnitTest.kt | 17 ------ build.gradle.kts | 4 +- gradle/libs.versions.toml | 58 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 48 insertions(+), 114 deletions(-) delete mode 100644 PaicordKt/src/androidTest/java/com/llsc12/paicord/ExampleInstrumentedTest.kt rename PaicordKt/src/main/{java => kotlin}/com/llsc12/paicord/MainActivity.kt (86%) rename PaicordKt/src/main/{java => kotlin}/com/llsc12/paicord/ui/theme/Color.kt (100%) rename PaicordKt/src/main/{java => kotlin}/com/llsc12/paicord/ui/theme/Theme.kt (100%) rename PaicordKt/src/main/{java => kotlin}/com/llsc12/paicord/ui/theme/Type.kt (100%) delete mode 100644 PaicordKt/src/test/java/com/llsc12/paicord/ExampleUnitTest.kt diff --git a/PaicordKt/build.gradle.kts b/PaicordKt/build.gradle.kts index e0c8d23e..5651a3d5 100644 --- a/PaicordKt/build.gradle.kts +++ b/PaicordKt/build.gradle.kts @@ -1,60 +1,48 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) + // alias(libs.plugins.jetbrains.kotlin.serialization) } android { namespace = "com.llsc12.paicord" - compileSdk = 36 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { applicationId = "com.llsc12.paicord" - minSdk = 28 - targetSdk = 36 + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() versionCode = 1 versionName = "1.0" - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { isMinifyEnabled = false proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) } } + compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = "17" - } - buildFeatures { - compose = true + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } } dependencies { - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.lifecycle.runtime.ktx) - implementation(libs.androidx.activity.compose) - implementation(platform(libs.androidx.compose.bom)) + // Compose/Material packages + implementation(project(":PaicordLib")) implementation(libs.androidx.ui) - implementation(libs.androidx.ui.graphics) - implementation(libs.androidx.ui.tooling.preview) + implementation(platform(libs.compose.bom)) implementation(libs.androidx.material3) - implementation("org.swift.swiftkit:swiftkit-core:1.0-SNAPSHOT") - implementation(project(":PaicordLib")) - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) - androidTestImplementation(platform(libs.androidx.compose.bom)) - androidTestImplementation(libs.androidx.ui.test.junit4) - debugImplementation(libs.androidx.ui.tooling) - debugImplementation(libs.androidx.ui.test.manifest) + implementation(libs.androidx.activity.compose) + + // Navigation 3 + // implementation(libs.androidx.navigation3.ui) + // implementation(libs.androidx.navigation3.runtime) + + // Kotlin serialization + // implementation(libs.kotlinx.serialization.core) } diff --git a/PaicordKt/src/androidTest/java/com/llsc12/paicord/ExampleInstrumentedTest.kt b/PaicordKt/src/androidTest/java/com/llsc12/paicord/ExampleInstrumentedTest.kt deleted file mode 100644 index e04db129..00000000 --- a/PaicordKt/src/androidTest/java/com/llsc12/paicord/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.llsc12.paicord - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.llsc12.paicord", appContext.packageName) - } -} diff --git a/PaicordKt/src/main/java/com/llsc12/paicord/MainActivity.kt b/PaicordKt/src/main/kotlin/com/llsc12/paicord/MainActivity.kt similarity index 86% rename from PaicordKt/src/main/java/com/llsc12/paicord/MainActivity.kt rename to PaicordKt/src/main/kotlin/com/llsc12/paicord/MainActivity.kt index 74083ecf..b50f4b59 100644 --- a/PaicordKt/src/main/java/com/llsc12/paicord/MainActivity.kt +++ b/PaicordKt/src/main/kotlin/com/llsc12/paicord/MainActivity.kt @@ -10,7 +10,6 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview import com.llsc12.paicord.ui.theme.PaicordTheme class MainActivity : ComponentActivity() { @@ -37,11 +36,3 @@ fun Greeting(name: String, modifier: Modifier = Modifier) { modifier = modifier ) } - -@Preview(showBackground = true) -@Composable -fun GreetingPreview() { - PaicordTheme { - Greeting("Android") - } -} diff --git a/PaicordKt/src/main/java/com/llsc12/paicord/ui/theme/Color.kt b/PaicordKt/src/main/kotlin/com/llsc12/paicord/ui/theme/Color.kt similarity index 100% rename from PaicordKt/src/main/java/com/llsc12/paicord/ui/theme/Color.kt rename to PaicordKt/src/main/kotlin/com/llsc12/paicord/ui/theme/Color.kt diff --git a/PaicordKt/src/main/java/com/llsc12/paicord/ui/theme/Theme.kt b/PaicordKt/src/main/kotlin/com/llsc12/paicord/ui/theme/Theme.kt similarity index 100% rename from PaicordKt/src/main/java/com/llsc12/paicord/ui/theme/Theme.kt rename to PaicordKt/src/main/kotlin/com/llsc12/paicord/ui/theme/Theme.kt diff --git a/PaicordKt/src/main/java/com/llsc12/paicord/ui/theme/Type.kt b/PaicordKt/src/main/kotlin/com/llsc12/paicord/ui/theme/Type.kt similarity index 100% rename from PaicordKt/src/main/java/com/llsc12/paicord/ui/theme/Type.kt rename to PaicordKt/src/main/kotlin/com/llsc12/paicord/ui/theme/Type.kt diff --git a/PaicordKt/src/test/java/com/llsc12/paicord/ExampleUnitTest.kt b/PaicordKt/src/test/java/com/llsc12/paicord/ExampleUnitTest.kt deleted file mode 100644 index 2242218c..00000000 --- a/PaicordKt/src/test/java/com/llsc12/paicord/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.llsc12.paicord - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/build.gradle.kts b/build.gradle.kts index ecf7a234..5c98ad09 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,5 +2,5 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.android.library) apply false -} \ No newline at end of file + alias(libs.plugins.kotlin.compose) apply false +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 62424a82..8a0ad188 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,38 +1,34 @@ [versions] -agp = "8.13.0" -kotlin = "2.0.21" -coreKtx = "1.16.0" -junit = "4.13.2" -junitVersion = "1.3.0" -espressoCore = "3.7.0" -appcompat = "1.7.1" -material = "1.12.0" -constraintlayout = "2.2.1" -lifecycleRuntimeKtx = "2.9.2" -activityCompose = "1.10.1" -composeBom = "2024.09.00" +#noinspection UnusedVersionCatalogEntry +compileSdk = "37" +#noinspection UnusedVersionCatalogEntry +targetSdk = "37" +#noinspection UnusedVersionCatalogEntry +minSdk = "24" +agp = "9.2.1" +nav3Core = "1.1.1" +composeBomVersion = "2026.05.00" +kotlin = "2.3.21" +material3 = "1.5.0-alpha19" +materialIconsCore = "1.7.8" +ui = "1.11.1" +kotlinSerialization = "2.3.21" +kotlinxSerializationCore = "1.11.0" +androidx-activity = "1.13.0" [libraries] -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -junit = { group = "junit", name = "junit", version.ref = "junit" } -androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } -androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } -androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } -androidx-material3 = { group = "androidx.compose.material3", name = "material3" } -androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } -androidx-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +# these icons can also be used later on +# androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCore" } +androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" } +compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } +androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" } +# use navigation 3 for later(?) +# androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" } +# androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3Core" } +# kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -android-library = { id = "com.android.library", version.ref = "agp" } -kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } \ No newline at end of file +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbc3ce4a..5dd3c012 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 9b78e729eed8cea28cc99568c2b0cc94da96ac8b Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 18 May 2026 17:20:33 +0300 Subject: [PATCH 2/9] fix: forgot to do this --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a0ad188..83130c7e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ compileSdk = "37" #noinspection UnusedVersionCatalogEntry targetSdk = "37" #noinspection UnusedVersionCatalogEntry -minSdk = "24" +minSdk = "26" agp = "9.2.1" nav3Core = "1.1.1" composeBomVersion = "2026.05.00" From 43a90c1d5ac7167c4273588c1d48ec8acbc2306f Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 18 May 2026 17:27:03 +0300 Subject: [PATCH 3/9] fix: add the swiftkitcore dependency back --- PaicordKt/build.gradle.kts | 4 +++- gradle/libs.versions.toml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PaicordKt/build.gradle.kts b/PaicordKt/build.gradle.kts index 5651a3d5..473a52be 100644 --- a/PaicordKt/build.gradle.kts +++ b/PaicordKt/build.gradle.kts @@ -32,8 +32,10 @@ android { } dependencies { - // Compose/Material packages + implementation(libs.swiftkit.core) implementation(project(":PaicordLib")) + + // Compose/Material packages implementation(libs.androidx.ui) implementation(platform(libs.compose.bom)) implementation(libs.androidx.material3) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 83130c7e..f96e6aec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,7 @@ ui = "1.11.1" kotlinSerialization = "2.3.21" kotlinxSerializationCore = "1.11.0" androidx-activity = "1.13.0" +swiftkitCore = "1.0-SNAPSHOT" [libraries] # these icons can also be used later on @@ -23,6 +24,7 @@ androidx-material3 = { module = "androidx.compose.material3:material3", version. compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" } +swiftkit-core = { module = "org.swift.swiftkit:swiftkit-core", version.ref = "swiftkitCore" } # use navigation 3 for later(?) # androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" } # androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3Core" } From efa474762aaaa6ae1400286e13255b28c292bcc6 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 18 May 2026 17:34:02 +0300 Subject: [PATCH 4/9] fix: paicordlib --- PaicordLib/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PaicordLib/build.gradle b/PaicordLib/build.gradle index c0819bbe..f4077fe1 100644 --- a/PaicordLib/build.gradle +++ b/PaicordLib/build.gradle @@ -1,10 +1,10 @@ import java.nio.file.* import org.gradle.internal.os.OperatingSystem import groovy.json.JsonSlurper -import kotlinx.serialization.json.* +// import kotlinx.serialization.json.* plugins { - alias(libs.plugins.android.library) + id 'com.android.library' } android { @@ -16,13 +16,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } } dependencies { - implementation('org.swift.swiftkit:swiftkit-core:1.0-SNAPSHOT') + implementation(libs.swiftkit.core) } // Helper function to get swiftly executable path From 5403ec8bfeaf85eb4cb5c39d07f4c15235dea805 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 18 May 2026 17:43:19 +0300 Subject: [PATCH 5/9] fix: paicordlib (again) --- PaicordKt/build.gradle.kts | 2 +- PaicordLib/build.gradle | 2 +- gradle/libs.versions.toml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/PaicordKt/build.gradle.kts b/PaicordKt/build.gradle.kts index 473a52be..9355aa18 100644 --- a/PaicordKt/build.gradle.kts +++ b/PaicordKt/build.gradle.kts @@ -32,7 +32,7 @@ android { } dependencies { - implementation(libs.swiftkit.core) + implementation("org.swift.swiftkit:swiftkit-core:1.0-SNAPSHOT") implementation(project(":PaicordLib")) // Compose/Material packages diff --git a/PaicordLib/build.gradle b/PaicordLib/build.gradle index f4077fe1..f8b69173 100644 --- a/PaicordLib/build.gradle +++ b/PaicordLib/build.gradle @@ -22,7 +22,7 @@ android { } dependencies { - implementation(libs.swiftkit.core) + implementation("org.swift.swiftkit:swiftkit-core:1.0-SNAPSHOT") } // Helper function to get swiftly executable path diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f96e6aec..83130c7e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,6 @@ ui = "1.11.1" kotlinSerialization = "2.3.21" kotlinxSerializationCore = "1.11.0" androidx-activity = "1.13.0" -swiftkitCore = "1.0-SNAPSHOT" [libraries] # these icons can also be used later on @@ -24,7 +23,6 @@ androidx-material3 = { module = "androidx.compose.material3:material3", version. compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" } -swiftkit-core = { module = "org.swift.swiftkit:swiftkit-core", version.ref = "swiftkitCore" } # use navigation 3 for later(?) # androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" } # androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3Core" } From c3bc9db3dec75fa54780f7069bea8e3693c1bbed Mon Sep 17 00:00:00 2001 From: Omar <180954465+omardotdev@users.noreply.github.com> Date: Mon, 18 May 2026 17:57:05 +0300 Subject: [PATCH 6/9] fix: dont mess with paicordlib imports --- PaicordLib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PaicordLib/build.gradle b/PaicordLib/build.gradle index f8b69173..691a6516 100644 --- a/PaicordLib/build.gradle +++ b/PaicordLib/build.gradle @@ -1,7 +1,7 @@ import java.nio.file.* import org.gradle.internal.os.OperatingSystem import groovy.json.JsonSlurper -// import kotlinx.serialization.json.* +import kotlinx.serialization.json.* plugins { id 'com.android.library' From 75358c9cafd744965a0d772216a7264bd390500d Mon Sep 17 00:00:00 2001 From: Omar <180954465+omardotdev@users.noreply.github.com> Date: Mon, 18 May 2026 17:57:44 +0300 Subject: [PATCH 7/9] feat: set minsdk to 28 (android 9) to follow paicordlib --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 83130c7e..3b598572 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ compileSdk = "37" #noinspection UnusedVersionCatalogEntry targetSdk = "37" #noinspection UnusedVersionCatalogEntry -minSdk = "26" +minSdk = "28" agp = "9.2.1" nav3Core = "1.1.1" composeBomVersion = "2026.05.00" From a1b523c2b76de35191f3691aa8120c9a4b38c5ef Mon Sep 17 00:00:00 2001 From: Omar <180954465+omardotdev@users.noreply.github.com> Date: Mon, 18 May 2026 17:58:34 +0300 Subject: [PATCH 8/9] i dont know why i did this --- PaicordLib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PaicordLib/build.gradle b/PaicordLib/build.gradle index 691a6516..d57827fa 100644 --- a/PaicordLib/build.gradle +++ b/PaicordLib/build.gradle @@ -22,7 +22,7 @@ android { } dependencies { - implementation("org.swift.swiftkit:swiftkit-core:1.0-SNAPSHOT") + implementation('org.swift.swiftkit:swiftkit-core:1.0-SNAPSHOT') } // Helper function to get swiftly executable path From 900594eca90c9409e292a0b1183d3e45176c853f Mon Sep 17 00:00:00 2001 From: Omar Date: Tue, 19 May 2026 12:09:49 +0300 Subject: [PATCH 9/9] fix: remove compose bom, add android library plugin to catalog --- PaicordKt/build.gradle.kts | 1 - PaicordLib/build.gradle | 4 ++-- build.gradle.kts | 1 + gradle/libs.versions.toml | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/PaicordKt/build.gradle.kts b/PaicordKt/build.gradle.kts index 9355aa18..4304b3a1 100644 --- a/PaicordKt/build.gradle.kts +++ b/PaicordKt/build.gradle.kts @@ -37,7 +37,6 @@ dependencies { // Compose/Material packages implementation(libs.androidx.ui) - implementation(platform(libs.compose.bom)) implementation(libs.androidx.material3) implementation(libs.androidx.activity.compose) diff --git a/PaicordLib/build.gradle b/PaicordLib/build.gradle index d57827fa..60263831 100644 --- a/PaicordLib/build.gradle +++ b/PaicordLib/build.gradle @@ -1,10 +1,10 @@ import java.nio.file.* import org.gradle.internal.os.OperatingSystem import groovy.json.JsonSlurper -import kotlinx.serialization.json.* +import kotlinx.serialization.* plugins { - id 'com.android.library' + alias(libs.plugins.android.library) } android { diff --git a/build.gradle.kts b/build.gradle.kts index 5c98ad09..daf86da9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,5 +2,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.compose) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3b598572..8e1b716f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,6 @@ targetSdk = "37" minSdk = "28" agp = "9.2.1" nav3Core = "1.1.1" -composeBomVersion = "2026.05.00" kotlin = "2.3.21" material3 = "1.5.0-alpha19" materialIconsCore = "1.7.8" @@ -20,7 +19,6 @@ androidx-activity = "1.13.0" # these icons can also be used later on # androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCore" } androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" } -compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" } # use navigation 3 for later(?) @@ -32,3 +30,4 @@ androidx-activity-compose = { group = "androidx.activity", name = "activity-comp android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +android-library = { id = "com.android.library", version.ref = "agp" }