Skip to content

Commit ba7829f

Browse files
committed
Update Kotlin to 1.9.20-Beta2 and other deps
1 parent 962f056 commit ba7829f

File tree

6 files changed

+21
-31
lines changed

6 files changed

+21
-31
lines changed

androidApp/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
compileSdk = 33
7+
compileSdk = 34
88
defaultConfig {
99
applicationId = "com.jetbrains.androidApp"
1010
minSdk = 21
11-
targetSdk = 33
11+
targetSdk = 34
1212
versionCode = 1
1313
versionName = "1.0"
1414
}
@@ -29,7 +29,7 @@ android {
2929

3030
dependencies {
3131
implementation(project(":shared"))
32-
implementation("com.google.android.material:material:1.9.0")
32+
implementation("com.google.android.material:material:1.10.0")
3333
implementation("androidx.appcompat:appcompat:1.6.1")
3434
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
3535
}

build.gradle.kts

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1-
buildscript {
2-
repositories {
3-
gradlePluginPortal()
4-
google()
5-
mavenCentral()
6-
}
7-
dependencies {
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
9-
classpath("com.android.tools.build:gradle:8.0.2")
10-
}
11-
}
12-
13-
allprojects {
14-
repositories {
15-
google()
16-
mavenCentral()
17-
}
18-
}
19-
20-
tasks.register("clean", Delete::class) {
21-
delete(rootProject.buildDir)
1+
plugins {
2+
//trick: for the same plugin versions in all sub-modules
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)
227
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#Gradle
2-
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
2+
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
33

44
#Kotlin
55
kotlin.code.style=official
66

77
#Android
88
android.useAndroidX=true
9+
android.nonTransitiveRClass=true
910

1011
#MPP
11-
kotlin.mpp.androidSourceSetLayoutVersion=2
1212
kotlin.mpp.enableCInteropCommonization=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

settings.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ pluginManagement {
66
}
77
}
88

9+
dependencyResolutionManagement {
10+
repositories {
11+
google()
12+
mavenCentral()
13+
}
14+
}
15+
916
rootProject.name = "KmmSample"
1017

1118
include(":androidApp")

shared/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ plugins {
44
}
55

66
kotlin {
7-
targetHierarchy.default()
8-
9-
android() {
7+
androidTarget {
108
compilations.all {
119
kotlinOptions {
1210
jvmTarget = "1.8"
@@ -25,7 +23,7 @@ kotlin {
2523
}
2624

2725
sourceSets {
28-
val commonTest by getting {
26+
commonTest {
2927
dependencies {
3028
implementation(kotlin("test-common"))
3129
implementation(kotlin("test-annotations-common"))

0 commit comments

Comments
 (0)