Update libs.versions.toml

Update gradle.properties

.github/workflows/build.yml

@@ -8,9 +8,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
+      - 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

@@ -10,6 +10,8 @@ build/
 out/
 
 secret.gradle
-local.properties
+local.*
+local/
+kotlin-js-store/
 
 publishing.sh

README.md

@@ -26,17 +26,21 @@ this case you must rename it in `settings.gradle` file.
 ## JVM sources in Android target
 
 By default JVM code is not included in Android target. In case you wish to include JVM sources in Android build, use
-next method in the end of your `build.gradle`:
+next method in the `sourceSets` section of your `build.gradle`:
 
 ```groovy
-enableIncludingJvmCodeInAndroidPart()
+kotlin {
+    sourceSets {
+        // Some other code
+        androidMain {
+            // Some other code (like dependencies)
+            dependsOn jvmMain
+        }
+    }
+}
 ```
 
-In case when you need to be sure that JVM sources are not included in Android part, use this snippet:
-
-```groovy
-disableIncludingJvmCodeInAndroidPart()
-```
+In case when you need to be sure that JVM sources are not included in Android part, just remove line with `dependsOn jvmMain`
 
 ## Types of projects
 

build.gradle

@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        jcenter()
         google()
         mavenCentral()
         mavenLocal()
@@ -8,21 +7,19 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+        classpath libs.android.tools.build
+        classpath libs.android.dexcount
+        classpath libs.kotlin.gradle.plugin
+        classpath libs.kotlin.serialization.plugin
+        classpath libs.kotlin.dokka.plugin
     }
 }
 
 allprojects {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
         google()
-        maven { url "https://kotlin.bintray.com/kotlinx" }
     }
 }
 

defaultAndroidSettings.gradle

@@ -1,37 +1,12 @@
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    ext {
-        jvmKotlinFolderFile = {
-            String sep = File.separator
-            return new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
-        }
-
-        enableIncludingJvmCodeInAndroidPart = {
-            File jvmKotlinFolder = jvmKotlinFolderFile()
-            if (jvmKotlinFolder.exists()) {
-                android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path
-            }
-        }
-
-        disableIncludingJvmCodeInAndroidPart = {
-            File jvmKotlinFolder = jvmKotlinFolderFile()
-            String[] oldDirs = android.sourceSets.main.java.srcDirs
-            android.sourceSets.main.java.srcDirs = []
-            for (oldDir in oldDirs) {
-                if (oldDir != jvmKotlinFolder.path) {
-                    android.sourceSets.main.java.srcDirs += oldDir
-                }
-            }
-        }
-    }
-
-    compileSdkVersion "$android_compileSdkVersion".toInteger()
-    buildToolsVersion "$android_buildToolsVersion"
+    compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
+    buildToolsVersion libs.versions.android.buildTools.get()
 
     defaultConfig {
-        minSdkVersion "$android_minSdkVersion".toInteger()
-        targetSdkVersion "$android_compileSdkVersion".toInteger()
+        minSdkVersion libs.versions.android.minSdk.get().toInteger()
+        targetSdkVersion libs.versions.android.compileSdk.get().toInteger()
         versionCode "${android_code_version}".toInteger()
         versionName "$version"
     }

gradle.properties

@@ -6,25 +6,6 @@ kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-kotlin_version=1.5.0
-kotlin_serialisation_core_version=1.2.0
-
-# github_release_plugin_version=2.2.12
-
-# ANDROID
-
-android_minSdkVersion=21
-android_compileSdkVersion=30
-android_buildToolsVersion=30.0.2
-dexcount_version=2.0.0
-junit_version=4.12
-test_ext_junit_version=1.1.2
-espresso_core=3.3.0
-
-# Dokka
-
-dokka_version=1.4.30
-
 # Project data
 
 group=project_group

gradle/libs.versions.toml

@@ -0,0 +1,40 @@
+[versions]
+
+kotlin = "1.8.10"
+kotlin-serialization = "1.5.0"
+
+dokka = "1.8.10"
+
+dexcount = "3.1.0"
+junit_version = "4.12"
+test_ext_junit_version = "1.1.3"
+espresso_core = "3.4.0"
+
+android-gradle-plugin = "7.3.1"
+android-minSdk = "21"
+android-compileSdk = "33"
+android-buildTools = "33.0.1"
+
+[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-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" }
+
+# buildscript classpaths
+
+android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
+android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
+kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
+
+[plugins]
+
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

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

lib/src/commonMain/kotlin/Library.kt

@@ -1,4 +1,4 @@
-package project_group
+package project_group.project_name.lib
 
 class Library {
     fun someLibraryMethod(): Boolean {

lib/src/commonTest/kotlin/LibraryTest.kt

@@ -1,7 +1,7 @@
 /*
  * This Kotlin source file was generated by the Gradle 'init' task.
  */
-package project_group
+package project_group.project_name.lib
 
 import kotlin.test.Test
 import kotlin.test.assertTrue

lib/src/main/AndroidManifest.xml

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

mppAndroidProject.gradle

@@ -11,13 +11,21 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation kotlin('stdlib')
+                implementation libs.kotlin
+                api libs.kotlin.serialization
             }
         }
         commonTest {
             dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
+                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
             }
         }
     }

mppJavaProject.gradle

@@ -5,26 +5,35 @@ project.group = "$group"
 
 kotlin {
     jvm {
-        compilations.main.kotlinOptions.useIR = true
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
     }
 
     sourceSets {
         commonMain {
             dependencies {
-                implementation kotlin('stdlib')
+                implementation libs.kotlin
+                api libs.kotlin.serialization
             }
         }
         commonTest {
             dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.test.common
+                implementation libs.kotlin.test.annotations.common
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation libs.kotlin.test.junit
+            }
+        }
     }
 }
 
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-    }
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

mppJsProject.gradle

@@ -4,7 +4,7 @@ project.group = "$group"
 // apply from: "$publishGradlePath"
 
 kotlin {
-    js (BOTH) {
+    js (IR) {
         browser()
         nodejs()
     }
@@ -12,19 +12,20 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation kotlin('stdlib')
+                implementation libs.kotlin
+                api libs.kotlin.serialization
             }
         }
         commonTest {
             dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.test.common
+                implementation libs.kotlin.test.annotations.common
             }
         }
         jsTest {
             dependencies {
-                implementation kotlin('test-js')
-                implementation kotlin('test-junit')
+                implementation libs.kotlin.test.js
+                implementation libs.kotlin.test.junit
             }
         }
     }

mppProjectWithSerialization.gradle

@@ -5,9 +5,13 @@ project.group = "$group"
 
 kotlin {
     jvm {
-        compilations.main.kotlinOptions.useIR = true
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
             }
-    js (BOTH) {
+        }
+    }
+    js (IR) {
         browser()
         nodejs()
     }
@@ -18,35 +22,40 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version"
+                implementation libs.kotlin
+                api libs.kotlin.serialization
             }
         }
         commonTest {
             dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.test.common
+                implementation libs.kotlin.test.annotations.common
             }
         }
         jvmTest {
             dependencies {
-                implementation kotlin('test-junit')
+                implementation libs.kotlin.test.junit
             }
         }
         jsTest {
             dependencies {
-                implementation kotlin('test-js')
-                implementation kotlin('test-junit')
+                implementation libs.kotlin.test.js
+                implementation libs.kotlin.test.junit
             }
         }
         androidTest {
             dependencies {
-                implementation kotlin('test-junit')
-                implementation "androidx.test.ext:junit:$test_ext_junit_version"
-                implementation "androidx.test.espresso:espresso-core:$espresso_core"
+                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"

settings.gradle

@@ -6,11 +6,13 @@ String[] includes = [
 
 
 includes.each { originalName ->
-    String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replaceAll(":", File.separator)}"
-    String projectName = "${rootProject.name}${originalName.replaceAll(":", ".")}"
+    String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}"
+    String projectName = "${rootProject.name}${originalName.replace(":", ".")}"
     String projectIdentifier = ":${projectName}"
     include projectIdentifier
     ProjectDescriptor project = project(projectIdentifier)
     project.name = projectName
     project.projectDir = new File(projectDirectory)
 }
+
+enableFeaturePreview("VERSION_CATALOGS")

template/build.gradle

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

template/src/commonMain/kotlin/PackageInfo.kt

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

template/src/main/AndroidManifest.xml

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