Skip to content

Commit

Permalink
Bump kotlin version to 1.9.20 (#62)
Browse files Browse the repository at this point in the history 
* Refresh versions.properties

* Bump kotlin version to 1.9.20

* Bump misc dependencies versions

* Temporarily disable build config plugin

* Downgrade ksp version to 1.9.20-RC-1.0.13

* Revert "Temporarily disable build config plugin"

This reverts commit d7e4ddc.

---------

Co-authored-by: GitHub Actions <noreply@github.com>
  • Loading branch information
@mr3y-the-programmer @web-flow
mr3y-the-programmer and web-flow authored Nov 10, 2023
1 parent da0e458 commit c34f17c
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 36 deletions.
2 changes: 1 addition & 1 deletion desktopApp/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ kotlin {
withJava()
}
sourceSets {
val jvmMain by getting {
jvmMain {
dependencies {
implementation(compose.desktop.currentOs)
implementation(compose.desktop.common)
Expand Down
45 changes: 16 additions & 29 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ android-application = "com.android.application:8.1.3"
## ⬆ :8.3.0-alpha09"
## ⬆ :8.3.0-alpha10"
## ⬆ :8.3.0-alpha11"
## ⬆ :8.3.0-alpha12"
android-library = "com.android.library:8.1.3"
## ⬆ :8.2.0-alpha01"
## ⬆ :8.2.0-alpha02"
Expand Down Expand Up @@ -75,24 +76,13 @@ android-library = "com.android.library:8.1.3"
## ⬆ :8.3.0-alpha09"
## ⬆ :8.3.0-alpha10"
## ⬆ :8.3.0-alpha11"
kotlin-android = "org.jetbrains.kotlin.android:1.9.10"
kotlin-jvm = "org.jetbrains.kotlin.jvm:1.9.10"
kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:1.9.10"
## ⬆ :1.9.20-Beta"
## ⬆ :1.9.20-Beta2"
## ⬆ :1.9.20-RC"
## ⬆ :1.9.20-RC2"
compose-multiplatform = "org.jetbrains.compose:1.5.10-beta02"
kotlin-ksp = "com.google.devtools.ksp:1.9.10-1.0.13"
## ⬆ :1.9.20-Beta-1.0.13"
## ⬆ :1.9.20-Beta2-1.0.13"
## ⬆ :1.9.20-RC-1.0.13"
## ⬆ :1.9.20-RC2-1.0.13"
kotlinx-serialization = "org.jetbrains.kotlin.plugin.serialization:1.9.10"
## ⬆ :1.9.20-Beta"
## ⬆ :1.9.20-Beta2"
## ⬆ :1.9.20-RC"
## ⬆ :1.9.20-RC2"
## ⬆ :8.3.0-alpha12"
kotlin-android = "org.jetbrains.kotlin.android:1.9.20"
kotlin-jvm = "org.jetbrains.kotlin.jvm:1.9.20"
kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:1.9.20"
compose-multiplatform = "org.jetbrains.compose:1.5.10"
kotlin-ksp = "com.google.devtools.ksp:1.9.20-RC-1.0.13"
kotlinx-serialization = "org.jetbrains.kotlin.plugin.serialization:1.9.20"
wire = "com.squareup.wire:4.9.1"
ktlint-plugin = "org.jlleitschuh.gradle.ktlint:11.6.1"
spotless-plugin = "com.diffplug.spotless:6.22.0"
Expand Down Expand Up @@ -134,8 +124,7 @@ androidx-browser = "androidx.browser:browser:1.6.0"
## ⬆ :1.7.0-alpha01"
## ⬆ :1.7.0-beta01"
## ⬆ :1.7.0-rc01"
kmpalette-core = "com.kmpalette:kmpalette-core:2.0.2"
## ⬆ :2.0.3"
kmpalette-core = "com.kmpalette:kmpalette-core:2.0.3"
views-material = "com.google.android.material:material:1.9.0"
## ⬆ :1.10.0-alpha01"
## ⬆ :1.10.0-alpha02"
Expand All @@ -161,6 +150,7 @@ androidx-annotations = "androidx.annotation:annotation:1.7.0"
leakcanary = "com.squareup.leakcanary:leakcanary-android:2.12"
coil = "io.coil-kt:coil-compose:2.5.0"
compose-imageloader = "io.github.qdsfdhvh:image-loader:1.6.8"
## ⬆ :1.7.0"
compose-richeditor = "com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-beta03"
kermit = "co.touchlab:kermit:2.0.2"
firebase-bom = "com.google.firebase:firebase-bom:32.5.0"
Expand All @@ -177,9 +167,9 @@ androidx-lifecycle-runtime-compose = "androidx.lifecycle:lifecycle-runtime-compo
## ⬆ :2.7.0-alpha02"
## ⬆ :2.7.0-alpha03"
## ⬆ :2.7.0-beta01"
voyager-navigator = "cafe.adriel.voyager:voyager-navigator:1.0.0-rc08"
voyager-transitions = "cafe.adriel.voyager:voyager-transitions:1.0.0-rc08"
molecule = "app.cash.molecule:molecule-runtime:1.2.1"
voyager-navigator = "cafe.adriel.voyager:voyager-navigator:1.0.0-rc09"
voyager-transitions = "cafe.adriel.voyager:voyager-transitions:1.0.0-rc09"
molecule = "app.cash.molecule:molecule-runtime:1.3.0"
androidx-test-core = "androidx.test:core:1.5.0"
## ⬆ :1.6.0-alpha01"
## ⬆ :1.6.0-alpha02"
Expand All @@ -206,10 +196,8 @@ sqldelight-paging = "app.cash.sqldelight:androidx-paging3-extensions:2.0.0"
sqlite-android = "com.github.requery:sqlite-android:3.43.0"
kotlin-inject-ksp = "me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3"
kotlin-inject-runtime = "me.tatarka.inject:kotlin-inject-runtime:0.6.3"
lyricist-core = "cafe.adriel.lyricist:lyricist:1.4.2"
## ⬆ :1.5.0"
## ⬆ :1.6.0"
lyricist-processor = "cafe.adriel.lyricist:lyricist-processor:1.4.2"
lyricist-core = "cafe.adriel.lyricist:lyricist:1.6.2"
lyricist-processor = "cafe.adriel.lyricist:lyricist-processor:1.6.2"
rss-parser = "com.prof18.rssparser:rssparser:6.0.4"
ktor-core = "io.ktor:ktor-client-core:2.3.5"
ktor-okhttp = "io.ktor:ktor-client-okhttp:2.3.5"
Expand All @@ -223,8 +211,7 @@ junit = "junit:junit:4.13.2"
strikt = "io.strikt:strikt-core:0.34.1"
turbine = "app.cash.turbine:turbine:1.0.0"
robolectric = "org.robolectric:robolectric:4.11.1"
test-parameter-injector = "com.google.testparameterinjector:test-parameter-injector:1.13"
## ⬆ :1.14"
test-parameter-injector = "com.google.testparameterinjector:test-parameter-injector:1.14"
kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"

Expand Down
10 changes: 5 additions & 5 deletions shared/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ kotlin {
}

@OptIn(ExperimentalKotlinGradlePluginApi::class)
targetHierarchy.custom {
applyHierarchyTemplate {
common {
// A shared sourceSet for (Jvm + Android) common implementations/dependencies such as Okhttp
group("desktopAndroid") {
Expand All @@ -43,7 +43,7 @@ kotlin {

sourceSets {
@OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
val commonMain by getting {
commonMain {
dependencies {
// Logging
implementation(libs.kermit)
Expand Down Expand Up @@ -102,7 +102,7 @@ kotlin {
implementation(libs.lyricist.processor)
}
}
val commonTest by getting {
commonTest {
dependencies {
implementation(libs.junit)
implementation(libs.strikt)
Expand All @@ -120,7 +120,7 @@ kotlin {
}
}

val androidMain by getting {
androidMain {
dependencies {
// Database driver
implementation(libs.sqldelight.android)
Expand Down Expand Up @@ -163,7 +163,7 @@ kotlin {

val desktopTest by getting {
dependencies {
dependsOn(commonTest)
dependsOn(commonTest.get())
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion versions.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
#### suppress inspection "SpellCheckingInspection" for whole file
#### suppress inspection "UnusedProperty" for whole file

version.androidx.compose.compiler=1.5.3
version.androidx.compose.compiler=1.5.4

0 comments on commit c34f17c

Please sign in to comment.