Skip to content

Commit 1059261

Browse files
authored
Merge pull request #805 from DennisBauer/renovate/kotlin
Update kotlin to v2.3.0 (minor)
2 parents 1a60d10 + 253ed5c commit 1059261

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

.github/workflows/pr_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
set -o pipefail
5656
57-
EXPECTED_COUNT=12
57+
EXPECTED_COUNT=14
5858
5959
./gradlew build --no-daemon --no-configuration-cache --no-build-cache --stacktrace 2>&1 | tee build_log.txt
6060

app/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ kotlin {
3232
jvm()
3333

3434
listOf(
35-
iosX64(),
3635
iosArm64(),
3736
iosSimulatorArm64(),
3837
).forEach { iosTarget ->
@@ -206,7 +205,6 @@ dependencies {
206205
add("kspAndroid", libs.room.compiler)
207206
add("kspJvm", libs.room.compiler)
208207
add("kspIosSimulatorArm64", libs.room.compiler)
209-
add("kspIosX64", libs.room.compiler)
210208
add("kspIosArm64", libs.room.compiler)
211209

212210
ktlintRuleset(libs.ktlint)

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
// this is necessary to avoid the plugins to be loaded multiple times
33
// in each subproject's classloader
44
alias(libs.plugins.androidApplication) apply false
5-
alias(libs.plugins.androidLibrary) apply false
65
alias(libs.plugins.org.jlleitschuh.gradle.ktlint) apply false
76
alias(libs.plugins.jetbrainsCompose) apply false
87
alias(libs.plugins.composeHotReload) apply false

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ compose-plugin = "1.9.3"
1717
composeHotReload = "1.0.0"
1818
glance = "1.2.0-rc01"
1919
koin = "4.1.1"
20-
kotlin = "2.2.21"
20+
kotlin = "2.3.0"
2121
kotlinx-coroutines = "1.10.2"
2222
kotlinx-datetime = "0.7.1"
2323
kotlinx-serialization-json = "1.9.0"
@@ -64,7 +64,6 @@ sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sql
6464
[plugins]
6565
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" }
6666
androidApplication = { id = "com.android.application", version.ref = "agp" }
67-
androidLibrary = { id = "com.android.library", version.ref = "agp" }
6867
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
6968
composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" }
7069
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }

0 commit comments

Comments
 (0)