From ef72365505a250cf93aa24430aa6930ad1aa197f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Nov 2023 17:29:46 +0600 Subject: [PATCH 1/4] start 1.2.4 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d87d911..dfb729e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 1.2.4 + ## 1.2.3 * `Kotlin`: `1.9.20` diff --git a/gradle.properties b/gradle.properties index 0727dde..d323db5 100644 --- a/gradle.properties +++ b/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 From aa7bd6179ab6f993bcc1732d10ce341a93d5a1a3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Nov 2023 17:59:22 +0600 Subject: [PATCH 2/4] update gradle versions and publication scripts --- defaultAndroidSettings.gradle | 4 ++-- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- publish.gradle | 6 ++++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle index 33f1969..a26bfe9 100644 --- a/defaultAndroidSettings.gradle +++ b/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 { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a7cea68..972c8f1 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 068cdb2..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/publish.gradle b/publish.gradle index 11a9ca8..bcb7ca2 100644 --- a/publish.gradle +++ b/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) + } } From ff14fd5e7c704267e670633712988d146ed46940 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Nov 2023 18:06:55 +0600 Subject: [PATCH 3/4] fixes of publication? --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d2c00f..3950b87 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ kotlin { publishAllLibraryVariants() compilations.all { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } } } From 48eeb6660eb70580389b5d86a34e563bba2cfad2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Nov 2023 18:14:14 +0600 Subject: [PATCH 4/4] fill changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfb729e..26ff044 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 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`