diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a5163..7cafa2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 0.7.2 +* `Kotlin`: `1.9.20` +* `Compose`: `1.5.10` + +## 0.7.2 + * `Kotlin`: `1.9.10` * `Compose`: `1.5.1` diff --git a/gradle.properties b/gradle.properties index 7917711..4a008d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ kotlin.incremental.js=true # Project data group=dev.inmo -version=0.7.2 +version=0.7.3 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2af9682..aa2804d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -kt = "1.9.10" -jb-compose = "1.5.1" -jb-dokka = "1.9.0" +kt = "1.9.20" +jb-compose = "1.5.10" +jb-dokka = "1.9.10" gh-release = "2.4.1" [libraries] 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 diff --git a/publish.gradle b/publish.gradle index 6f49589..9e31278 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,7 +1,7 @@ apply plugin: 'maven-publish' task javadocsJar(type: Jar) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' } publishing { @@ -84,4 +84,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/settings.gradle b/settings.gradle index 7fb8bea..f19c0e5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1 @@ rootProject.name = 'kjsuikit' - -enableFeaturePreview("VERSION_CATALOGS")