migrate build toolchain

This commit is contained in:
2026-08-31 14:27:39 +06:00
parent 0bff6fe11e
commit 56e5c58137
4 changed files with 21 additions and 47 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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