Update dependencies, use new Google Meerkat KMP Shared Module functionality

.gitignore

@@ -1,17 +1,28 @@
+### Gradle ###
+.gradle/
+build/
+
+### IDE ###
 *.iml
-.gradle
-/local.properties
+
+/.idea/
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
-.DS_Store
-/build
+
+### Kotlin ###
+
+/.kotlin/
+
+### Android ###
+local.properties
 /captures
 .externalNativeBuild
 .cxx
-local.properties
-/.idea/
-/.kotlin/
+
+### OS ###
+
+.DS_Store

README.md

@@ -2,4 +2,12 @@
 
 # Simple login
 
-This is a sample project for the [Make your Android application work on iOS](https://kotlinlang.org/docs/mobile/integrate-in-existing-app.html) tutorial. Master branch contains the project’s initial state: it’s a simple Android application generated with the Android Studio **Login Activity** wizard. You could find the final state with the iOS application and the shared module in the [final branch](https://github.com/Kotlin/kmm-integration-sample/tree/final)
+This is a sample project for the
+[Make your Android application work on iOS](https://kotlinlang.org/docs/mobile/integrate-in-existing-app.html)
+tutorial.
+
+The master branch contains the project’s initial state:
+it’s a simple Android application generated with the Android Studio **Login Activity** wizard.
+
+You could find the final state with the iOS application and the shared module in the
+[final branch](https://github.com/Kotlin/kmm-integration-sample/tree/final).

app/build.gradle.kts

@@ -1,6 +1,14 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+
 plugins {
-    id ("com.android.application")
-    id ("org.jetbrains.kotlin.android")
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JVM_1_8
+    }
 }
 
 android {
@@ -19,7 +27,7 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles (
+            proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
@@ -29,24 +37,21 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         viewBinding = true
     }
     namespace = "com.jetbrains.simplelogin.androidapp"
 }
 
 dependencies {
-    implementation (libs.androidx.core.ktx)
-    implementation (libs.androidx.appcompat)
-    implementation (libs.androidx.material)
-    implementation (libs.androidx.annotation)
-    implementation (libs.androidx.constraintlayout)
-    implementation (libs.androidx.lifecycle.livedata.ktx)
-    implementation (libs.androidx.lifecycle.viewmodel.ktx)
-    testImplementation (libs.junit)
-    androidTestImplementation (libs.androidx.test.junit)
-    androidTestImplementation (libs.androidx.espresso.core)
-}
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.material)
+    implementation(libs.androidx.annotation)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.lifecycle.livedata.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

build.gradle.kts

@@ -1,5 +1,3 @@
 plugins {
-    //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.2.0").apply(false)
-    kotlin("android").version("2.0.0").apply(false)
-}
+    base
+}

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.2.2"
+android-gradlePlugin = "8.2.2"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"
@@ -15,7 +15,7 @@ compose = "1.6.8"
 compose-plugin = "1.6.10"
 imageLoader = "1.6.3"
 junit = "4.13.2"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 kotlinxCoroutinesCore = "1.8.0"
 ktor = "2.3.7"
 lifecycleLivedataKtx = "2.8.2"
@@ -46,8 +46,8 @@ voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.
 ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 
 [plugins]
-androidApplication = { id = "com.android.application", version.ref = "agp" }
-androidLibrary = { id = "com.android.library", version.ref = "agp" }
+androidApplication = { id = "com.android.application", version.ref = "android-gradlePlugin" }
+androidLibrary = { id = "com.android.library", version.ref = "android-gradlePlugin" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Wed Feb 16 19:05:29 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists