Merge pull request #81 from InsanusMokrassar/2.2.3

2.2.3
This commit is contained in:
InsanusMokrassar 2023-11-02 23:28:22 +06:00 committed by GitHub
commit 697b4e81b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 11 deletions

View File

@ -1,5 +1,12 @@
# Changelog # Changelog
## 2.2.3
**THIS UPDATE CONTAINS UPGRADE OF USED JDK UP TO 17**
* Versions
* `Kotlin`: `1.9.20`
## 2.2.2 ## 2.2.2
* Versions * Versions

View File

@ -110,7 +110,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
android { android {
compileSdk "$android_compileSdkVersion".toInteger() compileSdk "$android_compileSdkVersion".toInteger()
buildToolsVersion "$android_buildToolsVersion" buildToolsVersion = "$android_buildToolsVersion"
namespace "${group}.${project.name}" namespace "${group}.${project.name}"
defaultConfig { defaultConfig {
@ -129,8 +129,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
sourceSets { sourceSets {
@ -142,6 +142,6 @@ android {
} }
java { java {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_17
} }

View File

@ -9,7 +9,7 @@ android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false
kotlin_version=1.9.20-RC kotlin_version=1.9.20
kotlin_coroutines_version=1.7.3 kotlin_coroutines_version=1.7.3
kotlin_serialization_version=1.6.0 kotlin_serialization_version=1.6.0
@ -23,7 +23,7 @@ github_release_plugin_version=2.4.1
## Android ## Android
android_gradle_version=7.4.2 android_gradle_version=8.1.2
android_minSdkVersion=21 android_minSdkVersion=21
android_compileSdkVersion=34 android_compileSdkVersion=34
android_buildToolsVersion=34.0.0 android_buildToolsVersion=34.0.0
@ -36,5 +36,5 @@ androidx_work_version=2.8.1
## Common ## Common
version=2.2.2 version=2.2.3
android_code_version=32 android_code_version=33

View File

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

View File

@ -1,7 +1,7 @@
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
task javadocsJar(type: Jar) { task javadocsJar(type: Jar) {
classifier = 'javadoc' archiveClassifier = 'javadoc'
} }
publishing { publishing {
@ -96,4 +96,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)
}
} }