From 849edadab084f2a76c3188d6b7de97ee637b6c24 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 6 Nov 2023 17:33:02 +0600 Subject: [PATCH 1/4] start 0.16.0 and update dependencies --- gradle.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0a217af..9a2c47e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,21 +6,21 @@ kotlin.incremental=true kotlin.incremental.js=true -kotlin_version=1.8.22 -kotlin_serialisation_core_version=1.5.1 +kotlin_version=1.9.20 +kotlin_serialisation_core_version=1.6.0 github_release_plugin_version=2.4.1 -tgbotapi_version=9.2.2 -micro_utils_version=0.19.9 -exposed_version=0.44.0 -plagubot_version=7.2.3 +tgbotapi_version=9.3.0 +micro_utils_version=0.20.12 +exposed_version=0.44.1 +plagubot_version=7.3.0 # Dokka -dokka_version=1.8.20 +dokka_version=1.9.10 # Project data group=dev.inmo -version=0.15.3 +version=0.16.0 From c0680932abf0f630c3c9d699efc5692c2a8aa3ed Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 6 Nov 2023 17:34:07 +0600 Subject: [PATCH 2/4] update jdk version everywhere up to 17 --- .github/workflows/commit-publish.yml | 2 +- mppJavaWithJsProject.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/commit-publish.yml b/.github/workflows/commit-publish.yml index c4f2598..0642d61 100644 --- a/.github/workflows/commit-publish.yml +++ b/.github/workflows/commit-publish.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Update version run: | branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" diff --git a/mppJavaWithJsProject.gradle b/mppJavaWithJsProject.gradle index 92790b8..57642f9 100644 --- a/mppJavaWithJsProject.gradle +++ b/mppJavaWithJsProject.gradle @@ -7,7 +7,7 @@ kotlin { jvm { compilations.main { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } } } @@ -44,6 +44,6 @@ kotlin { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } From b51bc975515b5eefea861be9de701f1d8ff38a24 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 6 Nov 2023 17:34:25 +0600 Subject: [PATCH 3/4] update gradle wrapper version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 774fae8..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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3bf2d858eb9d1eb95425e6f55af659ee0795b726 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 6 Nov 2023 17:35:41 +0600 Subject: [PATCH 4/4] update publishing script --- publish.gradle | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/publish.gradle b/publish.gradle index 690e65f..cd046ec 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,27 @@ 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) + } + // Workaround to make test tasks use sign + project.getTasks().withType(Sign.class).configureEach { signTask -> + def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name) + def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign + // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets + + // Task ':linkDebugTest' uses this output of task ':signPublication' without declaring an explicit or implicit dependency + def debugTestTask = tasks.findByName("linkDebugTest$pubName") + if (debugTestTask != null) { + signTask.mustRunAfter(debugTestTask) + } + // Task ':compileTestKotlin' uses this output of task ':signPublication' without declaring an explicit or implicit dependency + def testTask = tasks.findByName("compileTestKotlin$pubName") + if (testTask != null) { + signTask.mustRunAfter(testTask) + } + } }