From eb867e7366e301262531b44e446c53bc850c833f Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Thu, 2 Nov 2023 23:22:19 +0600
Subject: [PATCH] update dependencies and gradle environment

---
 CHANGELOG.md                             | 3 +++
 gradle.properties                        | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 publish.gradle                           | 8 +++++++-
 mpp_config.kpsb => publish.kpsb          | 0
 5 files changed, 13 insertions(+), 4 deletions(-)
 rename mpp_config.kpsb => publish.kpsb (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aee256f..c56ca01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 2.2.3
 
+* Versions
+  * `Kotlin`: `1.9.20`
+
 ## 2.2.2
 
 * Versions
diff --git a/gradle.properties b/gradle.properties
index c72f0d9..7309218 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.9.20-RC
+kotlin_version=1.9.20
 kotlin_coroutines_version=1.7.3
 kotlin_serialization_version=1.6.0
 
@@ -23,7 +23,7 @@ github_release_plugin_version=2.4.1
 
 ## Android
 
-android_gradle_version=7.4.2
+android_gradle_version=8.1.2
 android_minSdkVersion=21
 android_compileSdkVersion=34
 android_buildToolsVersion=34.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 03b6e33..b3fc208 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-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
diff --git a/publish.gradle b/publish.gradle
index b534efc..9191fc9 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
@@ -96,4 +96,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)
+    }
 }
diff --git a/mpp_config.kpsb b/publish.kpsb
similarity index 100%
rename from mpp_config.kpsb
rename to publish.kpsb