Update kotlin to v2.2.10

Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.8.1

.github/workflows/build.yml

@@ -5,15 +5,11 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
-      - name: Fix android 32.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Build with Gradle
         run: ./gradlew build

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.kotlin
 out/*
 *.iml
 target

.templates/README.md

@@ -0,0 +1,4 @@
+# Templates
+
+This folder contains templates to generate your modules in Intellij Idea with plugin
+[ModuleGenerator](https://plugins.jetbrains.com/plugin/21100-segment-generator)

.templates/mpp_android_module/ModuleGenerator.json

@@ -0,0 +1,5 @@
+{
+   "module_name": "sample",
+   "module_package": "feature.{{.module_name}}",
+   "full_module_package": "project_group.project_name.{{.module_package}}"
+}

.templates/mpp_android_module/{{.module_name.lowercase()}}/build.gradle

@@ -4,5 +4,5 @@ plugins {
     id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppAndroidProject"
 

.templates/mpp_android_module/{{.module_name.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_android_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_java_module/ModuleGenerator.json

@@ -0,0 +1,5 @@
+{
+   "module_name": "sample",
+   "module_package": "feature.{{.module_name}}",
+   "full_module_package": "project_group.project_name.{{.module_package}}"
+}

.templates/mpp_java_module/{{.module_name.lowercase()}}/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+}
+
+apply from: "$mppJavaProject"
+

.templates/mpp_java_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_java_module/{{.module_name.lowercase()}}/src/jvmMain/kotlin/JvmPackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_js_module/ModuleGenerator.json

@@ -0,0 +1,5 @@
+{
+   "module_name": "sample",
+   "module_package": "feature.{{.module_name}}",
+   "full_module_package": "project_group.project_name.{{.module_package}}"
+}

.templates/mpp_js_module/{{.module_name.lowercase()}}/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+}
+
+apply from: "$mppJsProject"
+

.templates/mpp_js_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_js_module/{{.module_name.lowercase()}}/src/jsMain/kotlin/JsPackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_module/ModuleGenerator.json

@@ -0,0 +1,5 @@
+{
+   "module_name": "sample",
+   "module_package": "feature.{{.module_name}}",
+   "full_module_package": "project_group.project_name.{{.module_package}}"
+}

.templates/mpp_module/{{.module_name.lowercase()}}/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+    id "com.android.library"
+}
+
+apply from: "$mppProjectWithSerialization"
+

.templates/mpp_module/{{.module_name.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

.templates/mpp_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt

@@ -0,0 +1 @@
+package {{.full_module_package}}

extensions.gradle

@@ -1,25 +1,32 @@
-allprojects {
+File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates")
-    ext {
-        projectByName = { String name ->
-            for (subproject in rootProject.subprojects) {
-                if (subproject.name == name) {
-                    return subproject
-                }
-            }
-            return null
-        }
 
-        internalProject = { String name ->
+Map properties = new HashMap<String, String>()
-            projectByName(name)
-        }
 
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
+if (templatesFolder.exists() && templatesFolder.isDirectory()) {
-        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
+    templatesFolder.listFiles().each {
-        mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
+        properties[it.name - ".gradle"] = it.absolutePath
-        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
+    }
-
+}
-        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
+
-
+properties["projectByName"] = { name ->
-        // publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
+    for (subproject in rootProject.subprojects) {
+        if (subproject.name == name) {
+            return subproject
+        }
+    }
+    return null
+}
+
+properties["internalProject"] = { name ->
+    projectByName("$name")
+}
+
+allprojects {
+    ext {
+        releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
+
+        properties.forEach { k, v ->
+            it[k] = v
+        }
     }
 }

gradle/libs.versions.toml

@@ -1,30 +1,33 @@
 [versions]
 
-kotlin = "1.8.10"
+kotlin = "2.2.10"
-kotlin-serialization = "1.5.0"
+kotlin-serialization = "1.8.1"
+kotlin-coroutines = "1.10.2"
 
-dokka = "1.8.10"
+dokka = "2.0.0"
 
-dexcount = "3.1.0"
+dexcount = "4.0.0"
 junit_version = "4.12"
-test_ext_junit_version = "1.1.3"
+test_ext_junit_version = "1.2.1"
-espresso_core = "3.4.0"
+espresso_core = "3.6.1"
 
-android-gradle-plugin = "7.3.1"
+android-gradle-plugin = "8.7.2"
 android-minSdk = "21"
-android-compileSdk = "33"
+android-compileSdk = "35"
-android-buildTools = "33.0.1"
+android-buildTools = "35.0.0"
 
 [libraries]
 
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
+kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
+kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines" }
 kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
 kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
 android-test-junit = { module = "androidx.test.ext:junit", version.ref = "test_ext_junit_version" }
-android-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso_core" }
+android-test-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso_core" }
 
 # buildscript classpaths
 

gradle/templates/defaultAndroidSettings.gradle

@@ -6,9 +6,11 @@ android {
 
     defaultConfig {
         minSdkVersion libs.versions.android.minSdk.get().toInteger()
+        compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
         targetSdkVersion libs.versions.android.compileSdk.get().toInteger()
         versionCode "${android_code_version}".toInteger()
         versionName "$version"
+        namespace "${project.group}.${project.name}"
     }
     buildTypes {
         release {
@@ -26,16 +28,7 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    sourceSets {
-        String sep = File.separator
-        main.java.srcDirs += "src${sep}main${sep}kotlin"
     }
 }

gradle/templates/defaultProject.gradle

@@ -0,0 +1,24 @@
+project.version = "$version"
+project.group = "$group"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.coroutines.test
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

gradle/templates/defaultProjectWithSerialization.gradle

@@ -0,0 +1,25 @@
+project.version = "$version"
+project.group = "$group"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api libs.kotlin.serialization
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.coroutines.test
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

gradle/templates/enableMPPAndroid.gradle

@@ -0,0 +1,31 @@
+kotlin {
+    androidTarget {
+        publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
+
+    sourceSets {
+        androidUnitTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation libs.android.test.junit
+                implementation libs.android.test.espresso
+            }
+        }
+        androidInstrumentedTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation libs.android.test.junit
+                implementation libs.android.test.espresso
+            }
+        }
+
+        androidMain.dependsOn jvmMain
+    }
+}
+
+apply from: "$defaultAndroidSettings"

gradle/templates/enableMPPJs.gradle

@@ -0,0 +1,30 @@
+kotlin {
+    js (IR) {
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "240000"
+                }
+            }
+        }
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "240000"
+                }
+            }
+        }
+    }
+
+    sourceSets {
+        jsMain {
+            dependencies {
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-js')
+            }
+        }
+    }
+}

gradle/templates/enableMPPJvm.gradle

@@ -0,0 +1,21 @@
+kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
+
+    sourceSets {
+        jvmMain {
+            dependencies {
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

gradle/templates/enableMPPNativeArm64.gradle

@@ -0,0 +1,8 @@
+kotlin {
+    linuxArm64()
+
+    sourceSets {
+        nativeMain.dependsOn commonMain
+        linuxArm64Main.dependsOn nativeMain
+    }
+}

gradle/templates/enableMPPNativeX64.gradle

@@ -0,0 +1,10 @@
+kotlin {
+    linuxX64()
+    mingwX64()
+
+    sourceSets {
+        nativeMain.dependsOn commonMain
+        linuxX64Main.dependsOn nativeMain
+        mingwX64Main.dependsOn nativeMain
+    }
+}

gradle/templates/enableMPPWasmJs.gradle

@@ -0,0 +1,27 @@
+kotlin {
+    wasmJs {
+        browser {
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                    useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d"))
+                }
+            }
+        }
+        nodejs {
+            testTask {
+                timeout = Duration.ofSeconds(240)
+                nodeJsArgs.add("--unhandled-rejections=warn")
+                nodeJsArgs.add("--trace-warnings")
+            }
+        }
+    }
+
+    sourceSets {
+        wasmJsTest {
+            dependencies {
+                implementation kotlin('test-wasm-js')
+            }
+        }
+    }
+}

gradle/templates/mppAndroidProject.gradle

@@ -0,0 +1,5 @@
+apply from: "$defaultProject"
+apply from: "$enableMPPJvm"
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPAndroid"

gradle/templates/mppJavaProject.gradle

@@ -0,0 +1,2 @@
+apply from: "$defaultProject"
+apply from: "$enableMPPJvm"

gradle/templates/mppJsProject.gradle

@@ -0,0 +1,2 @@
+apply from: "$defaultProject"
+apply from: "$enableMPPJs"

gradle/templates/mppProjectWithSerialization.gradle

@@ -0,0 +1,5 @@
+apply from: "$defaultProjectWithSerialization"
+apply from: "$enableMPPJvm"
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPAndroid"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/build.gradle

@@ -4,5 +4,5 @@ plugins {
     id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppProjectWithSerialization"
 

lib/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="project_group.project_name.lib"/>

mppAndroidProject.gradle

@@ -1,34 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-// apply from: "$publishGradlePath"
-
-kotlin {
-    android {
-        publishAllLibraryVariants()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        androidTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-                implementation libs.android.test.junit
-                implementation libs.android.test.espresso.core
-            }
-        }
-    }
-}
-
-apply from: "$defaultAndroidSettingsPresetPath"

mppJavaProject.gradle

@@ -1,39 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-// apply from: "$publishGradlePath"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

mppJsProject.gradle

@@ -1,32 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-// apply from: "$publishGradlePath"
-
-kotlin {
-    js (IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}

mppProjectWithSerialization.gradle

@@ -1,61 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-// apply from: "$publishGradlePath"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-    js (IR) {
-        browser()
-        nodejs()
-    }
-    android {
-        publishAllLibraryVariants()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-        androidTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-                implementation libs.android.test.junit
-                implementation libs.android.test.espresso.core
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-apply from: "$defaultAndroidSettingsPresetPath"

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

settings.gradle

@@ -14,5 +14,3 @@ includes.each { originalName ->
     project.name = projectName
     project.projectDir = new File(projectDirectory)
 }
-
-enableFeaturePreview("VERSION_CATALOGS")

template/src/commonMain/kotlin/PackageInfo.kt

@@ -1 +0,0 @@
-package project_group.project_name.template

template/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="project_group.project_name.template"/>