Merge pull request #55 from InsanusMokrassar/1.2.4

1.2.4

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.4
+
+**This update contains migration onto gradle 8+ (for both wrapper and android plugin). Use it with caution**
+
 ## 1.2.3
 
 * `Kotlin`: `1.9.20`

build.gradle

@@ -49,7 +49,7 @@ kotlin {
         publishAllLibraryVariants()
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }

defaultAndroidSettings.gradle

@@ -52,8 +52,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {

gradle.properties

@@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m
 # Project data
 
 group=dev.inmo
-version=1.2.3
-android_code_version=25
+version=1.2.4
+android_code_version=26

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 
 kotlin = "1.9.20"
-kotlin-gradle-plugin = "7.4.2"
+kotlin-gradle-plugin = "8.1.2"
 
 versions = "0.49.0"
 

gradle/wrapper/gradle-wrapper.properties

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

publish.gradle

@@ -103,4 +103,10 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
 }