mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-22 09:58:08 +00:00
Code Issues Releases Wiki Activity

Update Jetpack Compose compiler to 2.0

Browse Source 
This is the new way of including the Jetpack Compose compiler [1] starting from Kotlin 2.0


[1] https://android-developers.googleblog.com/2024/04/jetpack-compose-compiler-moving-to-kotlin-repository.html
This commit is contained in:
Albert Vaca Cintora 2024-05-21 09:46:23 +00:00
parent 8892750809
commit ca4a6eb06a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle.kts
View File

@ -14,6 +14,7 @@ plugins {
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt) alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.dependencyLicenseReport) alias(libs.plugins.dependencyLicenseReport)
alias(libs.plugins.compose.compiler)
} }
val licenseResDir = File("$projectDir/build/dependency-license-res") val licenseResDir = File("$projectDir/build/dependency-license-res")
@ -50,10 +51,6 @@ android {
buildConfig = true buildConfig = true
} }
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_9 sourceCompatibility = JavaVersion.VERSION_1_9
targetCompatibility = JavaVersion.VERSION_1_9 targetCompatibility = JavaVersion.VERSION_1_9

4
gradle.properties
View File

@ -1,3 +1,7 @@
android.enableJetifier=false android.enableJetifier=false
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx4096m org.gradle.jvmargs=-Xmx4096m
org.gradle.caching=true
org.gradle.parallel=true
# License report doesn't allow us to enable configuration caching
#org.gradle.configuration-cache=true

15
gradle/libs.versions.toml
View File

@ -1,7 +1,7 @@
[versions] [versions]
activityCompose = "1.9.0" activityCompose = "1.9.0"
androidDesugarJdkLibs = "2.0.4" androidDesugarJdkLibs = "2.0.4"
androidGradlePlugin = "8.4.0" androidGradlePlugin = "8.4.1"
androidSmsmms = "kdeconnect-1-21-0" androidSmsmms = "kdeconnect-1-21-0"
appcompat = "1.6.1" appcompat = "1.6.1"
bcpkixJdk15on = "1.70" bcpkixJdk15on = "1.70"
@ -10,19 +10,17 @@ commonsCollections4 = "4.4"
commonsIo = "2.16.1" commonsIo = "2.16.1"
commonsLang3 = "3.14.0" commonsLang3 = "3.14.0"
constraintlayoutCompose = "1.0.1" constraintlayoutCompose = "1.0.1"
compose-compiler = "1.5.11"
coreKtx = "1.13.1" coreKtx = "1.13.1"
disklrucache = "2.0.2" disklrucache = "2.0.2"
documentfile = "1.0.1" documentfile = "1.0.1"
gradle = "8.4.0"
gridlayout = "1.0.0" gridlayout = "1.0.0"
jsonassert = "1.5.1" jsonassert = "1.5.1"
junit = "4.13.2" junit = "4.13.2"
dependencyLicenseReport = "1.16" dependencyLicenseReport = "2.7"
kotlin = "1.9.23" kotlin = "2.0.0"
kotlinxCoroutinesCore = "1.8.1" kotlinxCoroutinesCore = "1.8.1"
lifecycleExtensions = "2.2.0" lifecycleExtensions = "2.2.0"
lifecycleRuntimeKtx = "2.7.0" lifecycleRuntimeKtx = "2.8.0"
logger = "1.0.3" logger = "1.0.3"
material = "1.12.0" material = "1.12.0"
material3 = "1.2.1" material3 = "1.2.1"
@ -65,9 +63,9 @@ commons-collections4 = { module = "org.apache.commons:commons-collections4", ver
commons-io = { module = "commons-io:commons-io", version.ref = "commonsIo" } commons-io = { module = "commons-io:commons-io", version.ref = "commonsIo" }
commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" } commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" }
disklrucache = { module = "com.jakewharton:disklrucache", version.ref = "disklrucache" } disklrucache = { module = "com.jakewharton:disklrucache", version.ref = "disklrucache" }
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
jsonassert = { module = "org.skyscreamer:jsonassert", version.ref = "jsonassert" } jsonassert = { module = "org.skyscreamer:jsonassert", version.ref = "jsonassert" }
junit = { module = "junit:junit", version.ref = "junit" } junit = { module = "junit:junit", version.ref = "junit" }
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" }
@ -84,6 +82,7 @@ slf4j-handroid = { group = "com.gitlab.mvysny.slf4j", name = "slf4j-handroid", v
[plugins] [plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
kotlin-android = { id ="org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
dependencyLicenseReport = { id = "com.github.jk1.dependency-license-report", version.ref = "dependencyLicenseReport" } dependencyLicenseReport = { id = "com.github.jk1.dependency-license-report", version.ref = "dependencyLicenseReport" }