Skip to content

Commit 1f13c08

Browse files
pahillpahill
authored
Merge pull request #8 from kotlin-hands-on/v2_main
V2 main
2 parents b667c95 + 29e7b50 commit 1f13c08

25 files changed

+228
-148
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/.idea/
1+
/.idea/
2+
.kotlin/

‎step2/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ plugins {
55
alias(libs.plugins.androidLibrary) apply false
66
alias(libs.plugins.jetbrainsCompose) apply false
77
alias(libs.plugins.kotlinMultiplatform) apply false
8+
alias(libs.plugins.compose.compiler) apply false
89
}

‎step2/composeApp/build.gradle.kts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
24

35
plugins {
46
alias(libs.plugins.kotlinMultiplatform)
57
alias(libs.plugins.androidApplication)
68
alias(libs.plugins.jetbrainsCompose)
9+
alias(libs.plugins.compose.compiler)
710
}
811

912
kotlin {
1013
androidTarget {
11-
compilations.all {
12-
kotlinOptions {
13-
jvmTarget = "11"
14-
}
14+
@OptIn(ExperimentalKotlinGradlePluginApi::class)
15+
compilerOptions {
16+
jvmTarget.set(JvmTarget.JVM_11)
1517
}
1618
}
1719

@@ -26,6 +28,7 @@ kotlin {
2628
implementation(compose.foundation)
2729
implementation(compose.material)
2830
implementation(compose.ui)
31+
@OptIn(ExperimentalComposeLibrary::class)
2932
implementation(compose.components.resources)
3033
implementation(compose.components.uiToolingPreview)
3134
implementation(projects.shared)

‎step2/gradle/libs.versions.toml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[versions]
2-
agp = "8.2.0"
2+
agp = "8.2.2"
33
android-compileSdk = "34"
44
android-minSdk = "24"
55
android-targetSdk = "34"
6-
androidx-activityCompose = "1.8.2"
7-
androidx-appcompat = "1.6.1"
6+
androidx-activityCompose = "1.9.0"
7+
androidx-appcompat = "1.7.0"
88
androidx-constraintlayout = "2.1.4"
9-
androidx-core-ktx = "1.12.0"
10-
androidx-espresso-core = "3.5.1"
11-
androidx-material = "1.11.0"
12-
androidx-test-junit = "1.1.5"
13-
compose = "1.6.2"
14-
compose-plugin = "1.6.0"
9+
androidx-core-ktx = "1.13.1"
10+
androidx-espresso-core = "3.6.1"
11+
androidx-material = "1.12.0"
12+
androidx-test-junit = "1.2.1"
13+
compose = "1.6.8"
14+
compose-plugin = "1.6.11"
1515
junit = "4.13.2"
16-
kotlin = "1.9.22"
16+
kotlin = "2.0.0"
1717

1818
[libraries]
1919
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -33,4 +33,5 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
3333
androidApplication = { id = "com.android.application", version.ref = "agp" }
3434
androidLibrary = { id = "com.android.library", version.ref = "agp" }
3535
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
36-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
36+
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
37+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

‎step2/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎step3/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ plugins {
55
alias(libs.plugins.androidLibrary) apply false
66
alias(libs.plugins.jetbrainsCompose) apply false
77
alias(libs.plugins.kotlinMultiplatform) apply false
8+
alias(libs.plugins.compose.compiler) apply false
89
}

‎step3/composeApp/build.gradle.kts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
24

35
plugins {
46
alias(libs.plugins.kotlinMultiplatform)
57
alias(libs.plugins.androidApplication)
68
alias(libs.plugins.jetbrainsCompose)
9+
alias(libs.plugins.compose.compiler)
710
}
811

912
kotlin {
1013
androidTarget {
11-
compilations.all {
12-
kotlinOptions {
13-
jvmTarget = "11"
14-
}
14+
@OptIn(ExperimentalKotlinGradlePluginApi::class)
15+
compilerOptions {
16+
jvmTarget.set(JvmTarget.JVM_11)
1517
}
1618
}
1719

‎step3/gradle/libs.versions.toml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[versions]
2-
agp = "8.2.0"
2+
agp = "8.2.2"
33
android-compileSdk = "34"
44
android-minSdk = "24"
55
android-targetSdk = "34"
6-
androidx-activityCompose = "1.8.2"
7-
androidx-appcompat = "1.6.1"
6+
androidx-activityCompose = "1.9.0"
7+
androidx-appcompat = "1.7.0"
88
androidx-constraintlayout = "2.1.4"
9-
androidx-core-ktx = "1.12.0"
10-
androidx-espresso-core = "3.5.1"
11-
androidx-material = "1.11.0"
12-
androidx-test-junit = "1.1.5"
13-
compose = "1.6.2"
14-
compose-plugin = "1.6.0"
9+
androidx-core-ktx = "1.13.1"
10+
androidx-espresso-core = "3.6.1"
11+
androidx-material = "1.12.0"
12+
androidx-test-junit = "1.2.1"
13+
compose = "1.6.8"
14+
compose-plugin = "1.6.11"
1515
junit = "4.13.2"
16-
kotlin = "1.9.22"
16+
kotlin = "2.0.0"
1717

1818
[libraries]
1919
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -33,4 +33,5 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
3333
androidApplication = { id = "com.android.application", version.ref = "agp" }
3434
androidLibrary = { id = "com.android.library", version.ref = "agp" }
3535
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
36-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
36+
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
37+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

‎step3/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎step4/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ plugins {
55
alias(libs.plugins.androidLibrary) apply false
66
alias(libs.plugins.jetbrainsCompose) apply false
77
alias(libs.plugins.kotlinMultiplatform) apply false
8+
alias(libs.plugins.compose.compiler) apply false
89
}

0 commit comments

Comments
 (0)