Merge c2de910504 into b59c325641

CHANGELOG.md

@@ -1,20 +1,5 @@
 # Changelog
 
-## 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

@@ -56,11 +56,8 @@ kotlin {
         browser()
         nodejs()
     }
-    androidTarget {
+    android {
-        publishLibraryVariants(
+        publishAllLibraryVariants()
-                "release",
-                "debug",
-        )
     }
     linuxX64()
     mingwX64()

github_release.gradle

@@ -11,20 +11,12 @@ private String getCurrentVersionChangelog(String version) {
     return changelogDataOS.toString().trim()
 }
 
-
+if (new File(projectDir, "secret.gradle").exists()) {
-def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
+    apply from: './secret.gradle'
-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 githubReleaseToken
+        token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
         owner = "InsanusMokrassar"
         repo = "${rootProject.name}"

gradle.properties

@@ -9,11 +9,11 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=2.3.10
+kotlin_version=2.1.0
-kotlin_coroutines_version=1.10.2
+kotlin_coroutines_version=1.10.1
-kotlin_serialization_version=1.10.0
+kotlin_serialization_version=1.8.0
 
-dokka_version=2.1.0
+dokka_version=2.0.0
 
 klockVersion=5.4.0
 
@@ -23,18 +23,18 @@ github_release_plugin_version=2.5.2
 
 ## Android
 
-android_gradle_version=8.12.+
+android_gradle_version=8.2.2
 android_minSdkVersion=21
-android_compileSdkVersion=36
+android_compileSdkVersion=35
-android_buildToolsVersion=36.0.0
+android_buildToolsVersion=35.0.0
 dexcount_version=4.0.0
-junit_version=4.13.2
+junit_version=4.12
-test_ext_junit_version=1.3.0
+test_ext_junit_version=1.1.3
-espresso_core=3.7.0
+espresso_core=3.4.0
 
-androidx_work_version=2.11.1
+androidx_work_version=2.10.0
 
 ## Common
 
-version=2.8.0
+version=2.7.1
-android_code_version=49
+android_code_version=47

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