migrate build toolchain

2.10.0

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## 3.0.0
+
+* `Version`:
+  * `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
+
+* `Version`:
+  * `Kotlin`: `2.3.21`
+  * `Coroutines`: `1.11.0`
+
+## 2.9.0
+
+* `Version`:
+  * `Kotlin`: `2.3.20`
+  * `Serialization`: `1.11.0`
+  * `Dokka`: `2.2.0`
+  * `AndroidXWork`: `2.11.2`
+
+## 2.8.0
+
+* `Version`:
+  * `Kotlin`: `2.3.10`
+  * `Coroutines`: `1.10.2`
+  * `Serialization`: `1.10.0`
+  * `AndroidXWork`: `2.11.1`
+  * `Android` (compileSdk): `36`
+
+## 2.7.2
+
+* `Version`:
+  * `Kotlin`: `2.1.10`
+  * `Serialization`: `1.8.0`
+
 ## 2.7.1
 
 * Fixes in parser and checker

build.gradle

@@ -19,6 +19,7 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
     id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
     id "org.jetbrains.dokka" version "$dokka_version"
+    id "com.gradleup.nmcp.aggregation" version "$nmcp_version"
 }
 
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
@@ -32,7 +33,7 @@ allprojects {
     }
 }
 
-apply plugin: "com.android.library"
+apply plugin: "com.android.kotlin.multiplatform.library"
 
 project.version = "$version"
 project.group = "dev.inmo"
@@ -40,6 +41,20 @@ project.group = "dev.inmo"
 apply from: "publish.gradle"
 apply from: "github_release.gradle"
 
+
+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    nmcpAggregation {
+        centralPortal {
+            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            validationTimeout = Duration.ofHours(4)
+            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
+        }
+
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
+}
+
 repositories {
     mavenLocal()
     // jcenter()
@@ -57,7 +72,14 @@ kotlin {
         nodejs()
     }
     android {
-        publishAllLibraryVariants()
+        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()
@@ -104,7 +126,7 @@ kotlin {
                 implementation kotlin('test-js')
             }
         }
-        androidUnitTest {
+        androidHostTest {
             dependencies {
                 implementation kotlin('test-junit')
             }
@@ -114,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

dokka.gradle

@@ -1,4 +1,4 @@
-dokkaHtml {
+dokka {
     String dokkaOutputDirectoryPath = null
     switch (true) {
         case project.hasProperty("DOKKA_PATH"):
@@ -32,7 +32,7 @@ dokkaHtml {
 
                 sourceLink {
                     localDirectory.set(file("./"))
-                    remoteUrl.set(new URL("https://github.com/InsanusMokrassar/krontab/blob/master/"))
+                    remoteUrl.set(new URI("https://github.com/InsanusMokrassar/krontab/blob/master/"))
                     remoteLineSuffix.set("#L")
                 }
             }

github_release.gradle

@@ -1,22 +1,36 @@
+interface InjectedExecOps {
+    @Inject //@javax.inject.Inject
+    ExecOperations getExecOps()
+}
 private String getCurrentVersionChangelog(String version) {
     OutputStream changelogDataOS = new ByteArrayOutputStream()
-    exec {
+
+    def injected = project.objects.newInstance(InjectedExecOps)
+    injected.execOps.exec {
         commandLine 'chmod', "+x", './changelog_parser.sh'
     }
-    exec {
+    injected.execOps.exec {
         standardOutput = changelogDataOS
-        commandLine './changelog_parser.sh', "$version", 'CHANGELOG.md'
+        commandLine './changelog_parser.sh', version, 'CHANGELOG.md'
     }
 
     return changelogDataOS.toString().trim()
 }
 
-if (new File(projectDir, "secret.gradle").exists()) {
-    apply from: './secret.gradle'
+
+def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
+def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
+
+def secretFile = new File(projectDir, "secret.gradle")
+if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
+    if (secretFile.exists()) {
+        apply from: './secret.gradle'
+    }
     apply plugin: "com.github.breadmoirai.github-release"
+    def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
 
     githubRelease {
-        token "${project.property('GITHUB_RELEASE_TOKEN')}"
+        token githubReleaseToken
 
         owner = "InsanusMokrassar"
         repo = "${rootProject.name}"

gradle.properties

@@ -1,40 +1,41 @@
-org.gradle.jvmargs=-Xmx512m
+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.1.0
-kotlin_coroutines_version=1.10.1
-kotlin_serialization_version=1.7.3
+kotlin_version=2.4.10
+kotlin_coroutines_version=1.11.0
+kotlin_serialization_version=1.11.0
 
-dokka_version=2.0.0
+dokka_version=2.2.0
 
 klockVersion=5.4.0
 
+nmcp_version=1.6.1
+
 ## Github reease
 
 github_release_plugin_version=2.5.2
 
 ## Android
 
-android_gradle_version=8.2.2
+android_gradle_version=9.3.2
 android_minSdkVersion=21
-android_compileSdkVersion=35
-android_buildToolsVersion=35.0.0
+android_compileSdkVersion=37
+android_buildToolsVersion=37.0.0
 dexcount_version=4.0.0
-junit_version=4.12
-test_ext_junit_version=1.1.3
-espresso_core=3.4.0
+junit_version=4.13.2
+test_ext_junit_version=1.3.0
+espresso_core=3.7.0
 
-androidx_work_version=2.10.0
+androidx_work_version=2.11.2
 
 ## Common
 
-version=2.7.1
-android_code_version=47
+version=3.0.0
+android_code_version=52

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-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip

publish.gradle

@@ -37,42 +37,42 @@ publishing {
                 
             }
         }
-        repositories {
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                maven {
-                    name = "GithubPackages"
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/krontab")
-            
-                    credentials {
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
-            
+    }
+    repositories {
+        if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+            maven {
+                name = "GithubPackages"
+                url = uri("https://maven.pkg.github.com/InsanusMokrassar/krontab")
+
+                credentials {
+                    username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                    password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
                 }
+
             }
-            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                maven {
-                    name = "InmoNexus"
-                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-            
-                    credentials {
-                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                    }
-            
+        }
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            maven {
+                name = "InmoNexus"
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+
+                credentials {
+                    username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                    password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                 }
+
             }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                maven {
-                    name = "sonatype"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-            
-                    credentials {
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
-            
+        }
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                 }
+
             }
         }
     }