Skip to content

Commit 69fedbc

Browse files
KA 2.3.0 - Kotlin 2.2.20 - KSP 2.2.20-2.0.4
1 parent 3553fca commit 69fedbc

File tree

12 files changed

+28
-58
lines changed

12 files changed

+28
-58
lines changed

example-cmp/composeApp/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import io.kotzilla.gradle.ext.KotzillaKeyGeneration
2-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
33

44
plugins {
55
alias(libs.plugins.kotlinMultiplatform)
@@ -14,10 +14,8 @@ plugins {
1414

1515
kotlin {
1616
androidTarget {
17-
compilations.all {
18-
kotlinOptions {
19-
jvmTarget = "11"
20-
}
17+
compilerOptions {
18+
jvmTarget.set(JvmTarget.JVM_11)
2119
}
2220
}
2321

example-cmp/composeApp/src/commonMain/kotlin/com/jetbrains/kmpapp/di/Koin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fun initKoin(config : KoinAppDeclaration ?= null) {
2121

2222
// Activate App analyses & Perf tracing
2323
// Check kotzilla.json file
24-
analytics()
24+
// analytics()
2525
}
2626

2727
val msgA = KoinPlatform.getKoin().get<PlatformComponentA>().sayHello()

example-cmp/composeApp/src/commonMain/kotlin/com/jetbrains/kmpapp/screens/detail/DetailViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.Flow
77
import org.koin.android.annotation.KoinViewModel
88
import org.koin.core.annotation.Monitor
99

10-
@Monitor
10+
//@Monitor
1111
@KoinViewModel
1212
class DetailViewModel(private val museumRepository: MuseumRepository) : ViewModel() {
1313

example-cmp/data/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
23

34
plugins {
@@ -10,10 +11,8 @@ plugins {
1011

1112
kotlin {
1213
androidTarget {
13-
compilations.all {
14-
kotlinOptions {
15-
jvmTarget = "11"
16-
}
14+
compilerOptions {
15+
jvmTarget.set(JvmTarget.JVM_11)
1716
}
1817
}
1918

example-cmp/data/src/commonMain/kotlin/com/jetbrains/kmpapp/data/MuseumRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
77
import org.koin.core.annotation.Monitor
88
import org.koin.core.annotation.Single
99

10-
@Monitor
10+
//@Monitor
1111
@Single
1212
class MuseumRepository(
1313
private val museumApi: MuseumApi,

example-cmp/gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[versions]
2-
kotlin = "2.1.21"
2+
kotlin = "2.2.20"
33
agp = "8.6.1"
44
androidx-activityCompose = "1.10.1"
55
androidx-ui-tooling = "1.8.2"
6-
compose-plugin = "1.8.2"
6+
compose-plugin = "1.9.1"
77
kamel = "0.9.4"
8-
ktor = "3.1.3"
8+
ktor = "3.3.1"
99
materialIconsCore = "1.7.3"
10-
navigationCompose = "2.9.0-beta05"
11-
lifecycleCompose = "2.9.2"
12-
coil = "3.2.0"
10+
navigationCompose = "2.9.1"
11+
lifecycleCompose = "2.9.5"
12+
coil = "3.3.0"
1313

1414
koin = "4.1.1"
1515
koin-annotations = "2.2.0"
16-
kotzilla = "1.2.2"
17-
ksp = "2.1.21-2.0.2"
16+
kotzilla = "1.2.3"
17+
ksp = "2.2.20-2.0.4"
1818

1919
[libraries]
2020
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }

examples/gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# /!\ Koin in gradle.properties /!\
44

55
# Core
6-
kotlin = "2.1.21"
7-
koin = "4.1.0"
8-
koinAnnotations = "2.2.0"
9-
ksp = "2.1.21-2.0.2"
6+
kotlin = "2.2.20"
7+
koin = "4.1.1"
8+
koinAnnotations = "2.3.0-RC1"
9+
ksp = "2.2.20-2.0.4"
1010
junit = "4.13.2"
1111
# Android
1212
agp = "8.3.2"

projects/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ org.gradle.parallel=true
77
#Kotlin
88
kotlin.code.style=official
99
#Koin
10-
koinAnnotationsVersion=2.2.0
10+
koinAnnotationsVersion=2.3.0-RC1
1111
#Android
1212
android.useAndroidX=true
1313
androidMinSDK=14

projects/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# /!\ Koin in gradle.properties /!\
44

55
# Core
6-
kotlin = "2.1.21"
6+
kotlin = "2.2.20"
77
koin = "4.1.0"
8-
ksp = "2.1.21-2.0.2"
8+
ksp = "2.2.20-2.0.4"
99
publish = "2.0.0"
1010
dokka = "1.9.10"
1111
nmcp = "1.0.1"

projects/koin-annotations/build.gradle.kts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
1+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
55
alias(libs.plugins.kotlinMultiplatform)
66
}
77

88
kotlin {
9-
jvm {
10-
withJava()
11-
}
9+
jvm()
1210

1311
js(IR) {
1412
nodejs()
1513
browser()
1614
binaries.executable()
1715
}
1816

17+
@OptIn(ExperimentalWasmDsl::class)
1918
wasmJs {
2019
binaries.executable()
2120
nodejs()
@@ -47,13 +46,4 @@ kotlin {
4746
}
4847
}
4948

50-
rootProject.the<NodeJsRootExtension>().apply {
51-
nodeVersion = "21.0.0-v8-canary202309143a48826a08"
52-
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
53-
}
54-
55-
tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
56-
args.add("--ignore-engines")
57-
}
58-
5949
apply(from = file("../gradle/publish.gradle.kts"))

0 commit comments

Comments
 (0)