Merge pull request #55 from InsanusMokrassar/1.2.4

1.2.4
This commit is contained in:
InsanusMokrassar 2023-11-02 18:16:47 +06:00 committed by GitHub
commit fb0f61bb15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 7 deletions

View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 1.2.4
**This update contains migration onto gradle 8+ (for both wrapper and android plugin). Use it with caution**
## 1.2.3 ## 1.2.3
* `Kotlin`: `1.9.20` * `Kotlin`: `1.9.20`

View File

@ -49,7 +49,7 @@ kotlin {
publishAllLibraryVariants() publishAllLibraryVariants()
compilations.all { compilations.all {
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "17"
} }
} }
} }

View File

@ -52,8 +52,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
sourceSets { sourceSets {

View File

@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m
# Project data # Project data
group=dev.inmo group=dev.inmo
version=1.2.3 version=1.2.4
android_code_version=25 android_code_version=26

View File

@ -1,7 +1,7 @@
[versions] [versions]
kotlin = "1.9.20" kotlin = "1.9.20"
kotlin-gradle-plugin = "7.4.2" kotlin-gradle-plugin = "8.1.2"
versions = "0.49.0" versions = "0.49.0"

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -103,4 +103,10 @@ if (project.hasProperty("signing.gnupg.keyName")) {
dependsOn(it) 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)
}
} }