From 7e1fb011c85dca09f45e284aa473be4c53ad9d5d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 31 Aug 2026 13:29:40 +0600 Subject: [PATCH 1/3] start 3.0.0 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab656da..75b4216 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 3.0.0 + ## 2.10.0 * `Version`: diff --git a/gradle.properties b/gradle.properties index 6f28471..ea7ca26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,5 +39,5 @@ androidx_work_version=2.11.2 ## Common -version=2.10.0 -android_code_version=51 +version=3.0.0 +android_code_version=52 From 0bff6fe11ed1c74d16be17355c1917bc65bbc832 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 31 Aug 2026 13:51:06 +0600 Subject: [PATCH 2/3] update dependencies --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b4216..0013de5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 3.0.0 +* `Version`: + * `NMCP`: `1.6.1` + ## 2.10.0 * `Version`: diff --git a/gradle.properties b/gradle.properties index ea7ca26..827702b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ dokka_version=2.2.0 klockVersion=5.4.0 -nmcp_version=1.5.0 +nmcp_version=1.6.1 ## Github reease From 56e5c58137a163e7dfd6f7df0ea91be1fb5d2d77 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 31 Aug 2026 14:27:39 +0600 Subject: [PATCH 3/3] migrate build toolchain --- CHANGELOG.md | 7 +++- build.gradle | 49 +++++------------------- gradle.properties | 10 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 21 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0013de5..2e96800 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,12 @@ ## 3.0.0 * `Version`: - * `NMCP`: `1.6.1` + * `Kotlin`: `2.3.21` -> `2.4.10` + * `Gradle`: `9.3.0` -> `9.7.1` + * `Android Gradle Plugin`: `8.13.+` -> `9.3.2` + * `Android` (compileSdk): `36` -> `37` + * `Android Build Tools`: `36.0.0` -> `37.0.0` + * `NMCP`: `1.5.0` -> `1.6.1` ## 2.10.0 diff --git a/build.gradle b/build.gradle index c2fdd48..fd87168 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ allprojects { } } -apply plugin: "com.android.library" +apply plugin: "com.android.kotlin.multiplatform.library" project.version = "$version" project.group = "dev.inmo" @@ -71,11 +71,15 @@ kotlin { browser() nodejs() } - androidTarget { - publishLibraryVariants( - "release", - "debug", + android { + compileSdk = "$android_compileSdkVersion".toInteger() + buildToolsVersion = "$android_buildToolsVersion" + minSdk = "$android_minSdkVersion".toInteger() + namespace = "${project.group}.${project.name}" + compilerOptions.jvmTarget.set( + compilerOptions.jvmTarget.get().class.fromTarget("17") ) + withHostTest {} } linuxX64() mingwX64() @@ -122,7 +126,7 @@ kotlin { implementation kotlin('test-js') } } - androidUnitTest { + androidHostTest { dependencies { implementation kotlin('test-junit') } @@ -132,39 +136,6 @@ kotlin { apply plugin: 'com.getkeepsafe.dexcount' -android { - compileSdk "$android_compileSdkVersion".toInteger() - buildToolsVersion = "$android_buildToolsVersion" - namespace "${group}.${project.name}" - - defaultConfig { - minSdkVersion "$android_minSdkVersion".toInteger() - targetSdkVersion "$android_compileSdkVersion".toInteger() - versionCode "${android_code_version}".toInteger() - versionName "$version" - } - buildTypes { - release { - minifyEnabled false - } - debug { - debuggable true - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - test { - java.srcDir file("src/jvmTest") - } - } -} - java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/gradle.properties b/gradle.properties index 827702b..179e050 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,13 @@ org.gradle.jvmargs=-Xmx1g -Xms500m kotlin.daemon.jvmargs=-Xmx1g -Xms500m kotlin.code.style=official org.gradle.parallel=true -kotlin.js.generate.externals=true kotlin.incremental=true kotlin.incremental.js=true kotlin.incremental.multiplatform=true android.useAndroidX=true -android.enableJetifier=false -kotlin_version=2.3.21 +kotlin_version=2.4.10 kotlin_coroutines_version=1.11.0 kotlin_serialization_version=1.11.0 @@ -26,10 +24,10 @@ github_release_plugin_version=2.5.2 ## Android -android_gradle_version=8.13.+ +android_gradle_version=9.3.2 android_minSdkVersion=21 -android_compileSdkVersion=36 -android_buildToolsVersion=36.0.0 +android_compileSdkVersion=37 +android_buildToolsVersion=37.0.0 dexcount_version=4.0.0 junit_version=4.13.2 test_ext_junit_version=1.3.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df82445..fa20862 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip