File tree Expand file tree Collapse file tree 6 files changed +21
-31
lines changed Expand file tree Collapse file tree 6 files changed +21
-31
lines changed Original file line number Diff line number Diff line change @@ -4,11 +4,11 @@ plugins {
44}
55
66android {
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
3030dependencies {
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}
Original file line number Diff line number Diff line change 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}
Original file line number Diff line number Diff line change 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
55kotlin.code.style =official
66
77# Android
88android.useAndroidX =true
9+ android.nonTransitiveRClass =true
910
1011# MPP
11- kotlin.mpp.androidSourceSetLayoutVersion =2
1212kotlin.mpp.enableCInteropCommonization =true
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33distributionPath =wrapper/dists
44zipStoreBase =GRADLE_USER_HOME
55zipStorePath =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
Original file line number Diff line number Diff line change @@ -6,6 +6,13 @@ pluginManagement {
66 }
77}
88
9+ dependencyResolutionManagement {
10+ repositories {
11+ google()
12+ mavenCentral()
13+ }
14+ }
15+
916rootProject.name = " KmmSample"
1017
1118include(" :androidApp" )
Original file line number Diff line number Diff line change @@ -4,9 +4,7 @@ plugins {
44}
55
66kotlin {
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" ))
You can’t perform that action at this time.
0 commit comments