Skip to content

Commit 2144ca2

Browse files
update to support gradle 8.+
1 parent bf21f92 commit 2144ca2

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/GpgSignMavenConfig.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ if (project.hasProperty("signing.gnupg.keyName")) {
2020
dependsOn(it)
2121
}
2222
}
23+
24+
// Workaround to make android sign operations depend on signing tasks
25+
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
26+
def signingTasks = project.getTasks().withType(Sign.class)
27+
mustRunAfter(signingTasks)
28+
}
2329
}
2430
"""
2531
GpgSigning.Enabled ->

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/js_only/MavenTemplater.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ fun MavenConfig.buildJsOnlyMavenConfig(licenses: List<License>): String = """
77
apply plugin: 'maven-publish'
88
99
task javadocJar(type: Jar) {
10-
classifier = 'javadoc'
10+
archiveClassifier = 'javadoc'
1111
}
1212
task sourcesJar(type: Jar) {
1313
kotlin.sourceSets.all {
1414
from(kotlin)
1515
}
16-
classifier = 'sources'
16+
archiveClassifier = 'sources'
1717
}
1818
1919
publishing {

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/mpp/MavenTemplater.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fun MavenConfig.buildMultiplatformMavenConfig(licenses: List<License>): String =
77
apply plugin: 'maven-publish'
88
99
task javadocsJar(type: Jar) {
10-
classifier = 'javadoc'
10+
archiveClassifier = 'javadoc'
1111
}
1212
1313
publishing {

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22

3-
kt = "1.8.20"
4-
kt-serialization = "1.5.1"
5-
kt-coroutines = "1.7.2"
3+
kt = "1.9.20"
4+
kt-serialization = "1.6.0"
5+
kt-coroutines = "1.7.3"
66

7-
jb-compose = "1.4.1"
8-
jb-dokka = "1.8.20"
9-
microutils = "0.19.7"
10-
kjsuikit = "0.7.1"
7+
jb-compose = "1.5.10"
8+
jb-dokka = "1.9.10"
9+
microutils = "0.20.11"
10+
kjsuikit = "0.7.2"
1111

12-
ktor = "2.3.2"
12+
ktor = "2.3.5"
1313

1414
gh-release = "2.4.1"
1515

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

0 commit comments

Comments
 (0)