Skip to content

Commit e1b6fb3

Browse files
committed
Update Kotlin to 1.9.20-Beta2 and deps
1 parent 51ffcf9 commit e1b6fb3

File tree

5 files changed

+21
-27
lines changed

5 files changed

+21
-27
lines changed

step2/androidApp/build.gradle.kts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ plugins {
55

66
android {
77
namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
8-
compileSdk = 33
8+
compileSdk = 34
99
defaultConfig {
1010
applicationId = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
1111
minSdk = 24
12-
targetSdk = 33
12+
targetSdk = 34
1313
versionCode = 1
1414
versionName = "1.0"
1515
}
1616
buildFeatures {
1717
compose = true
1818
}
1919
composeOptions {
20-
kotlinCompilerExtensionVersion = "1.4.7"
20+
kotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf"
2121
}
2222
packaging {
2323
resources {
@@ -30,20 +30,20 @@ android {
3030
}
3131
}
3232
compileOptions {
33-
sourceCompatibility = JavaVersion.VERSION_1_8
34-
targetCompatibility = JavaVersion.VERSION_1_8
33+
sourceCompatibility = JavaVersion.VERSION_17
34+
targetCompatibility = JavaVersion.VERSION_17
3535
}
3636
kotlinOptions {
37-
jvmTarget = "1.8"
37+
jvmTarget = "17"
3838
}
3939
}
4040

4141
dependencies {
4242
implementation(project(":shared"))
43-
implementation("androidx.compose.ui:ui:1.4.3")
44-
implementation("androidx.compose.ui:ui-tooling:1.4.3")
45-
implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")
46-
implementation("androidx.compose.foundation:foundation:1.4.3")
47-
implementation("androidx.compose.material:material:1.4.3")
48-
implementation("androidx.activity:activity-compose:1.7.1")
43+
implementation("androidx.compose.ui:ui:1.5.3")
44+
implementation("androidx.compose.ui:ui-tooling:1.5.3")
45+
implementation("androidx.compose.ui:ui-tooling-preview:1.5.3")
46+
implementation("androidx.compose.foundation:foundation:1.5.3")
47+
implementation("androidx.compose.material:material:1.5.3")
48+
implementation("androidx.activity:activity-compose:1.8.0")
4949
}

step2/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
plugins {
22
//trick: for the same plugin versions in all sub-modules
3-
id("com.android.application").version("8.0.2").apply(false)
4-
id("com.android.library").version("8.0.2").apply(false)
5-
kotlin("android").version("1.8.21").apply(false)
6-
kotlin("multiplatform").version("1.8.21").apply(false)
7-
}
8-
9-
tasks.register("clean", Delete::class) {
10-
delete(rootProject.buildDir)
3+
id("com.android.application").version("8.1.2").apply(false)
4+
id("com.android.library").version("8.1.2").apply(false)
5+
kotlin("android").version("1.9.20-Beta2").apply(false)
6+
kotlin("multiplatform").version("1.9.20-Beta2").apply(false)
117
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Jul 11 11:08:14 SAST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

step2/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ pluginManagement {
33
google()
44
gradlePluginPortal()
55
mavenCentral()
6+
maven("https://androidx.dev/storage/compose-compiler/repository/")
67
}
78
}
89

step2/shared/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ plugins {
33
id("com.android.library")
44
}
55

6-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
76
kotlin {
8-
targetHierarchy.default()
9-
10-
android {
7+
androidTarget {
118
compilations.all {
129
kotlinOptions {
1310
jvmTarget = "1.8"
@@ -26,12 +23,12 @@ kotlin {
2623
}
2724

2825
sourceSets {
29-
val commonMain by getting {
26+
commonMain {
3027
dependencies {
3128
//put your multiplatform dependencies here
3229
}
3330
}
34-
val commonTest by getting {
31+
commonTest {
3532
dependencies {
3633
implementation(kotlin("test"))
3734
}

0 commit comments

Comments
 (0)