mirror of
https://gitlab.com/ultrasonic/ultrasonic.git
synced 2025-06-06 10:33:05 +03:00
Update dependency com.android.tools.build:gradle to v7.4.0
This commit is contained in:
parent
854ef5ad60
commit
da4139dabc
@ -40,7 +40,7 @@ allprojects {
|
|||||||
// Set Kotlin JVM target to the same for all subprojects
|
// Set Kotlin JVM target to the same for all subprojects
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "11"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
[versions]
|
[versions]
|
||||||
# You need to run ./gradlew wrapper after updating the version
|
# You need to run ./gradlew wrapper after updating the version
|
||||||
gradle = "7.5.1"
|
gradle = "7.6"
|
||||||
|
|
||||||
navigation = "2.5.3"
|
navigation = "2.5.3"
|
||||||
gradlePlugin = "7.3.1"
|
gradlePlugin = "7.4.0"
|
||||||
androidxcore = "1.9.0"
|
androidxcore = "1.9.0"
|
||||||
ktlint = "0.43.2"
|
ktlint = "0.43.2"
|
||||||
ktlintGradle = "11.0.0"
|
ktlintGradle = "11.0.0"
|
||||||
|
@ -16,9 +16,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
// Sets Java compatibility to Java 8
|
sourceCompatibility JavaVersion.VERSION_11
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_11
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@ -29,7 +29,7 @@ if (isCodeQualityEnabled) {
|
|||||||
config = files("${rootProject.projectDir}/detekt-config.yml")
|
config = files("${rootProject.projectDir}/detekt-config.yml")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tasks.detekt.jvmTarget = "1.8"
|
tasks.detekt.jvmTarget = "11"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "11"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
@ -59,8 +59,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_11
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_11
|
||||||
}
|
}
|
||||||
|
|
||||||
kapt {
|
kapt {
|
||||||
|
@ -119,13 +119,13 @@ class EditServerModel(val app: Application) : AndroidViewModel(app), KoinCompone
|
|||||||
|
|
||||||
// Execute a ping to retrieve the API version.
|
// Execute a ping to retrieve the API version.
|
||||||
// This is accepted to fail if the authentication is incorrect yet.
|
// This is accepted to fail if the authentication is incorrect yet.
|
||||||
var pingResponse = client.api.pingSuspend()
|
val pingResponse = client.api.pingSuspend()
|
||||||
val restApiVersion = pingResponse.version.restApiVersion
|
val restApiVersion = pingResponse.version.restApiVersion
|
||||||
serverSetting.minimumApiVersion = restApiVersion
|
serverSetting.minimumApiVersion = restApiVersion
|
||||||
Timber.i("Server minimum API version set to %s", restApiVersion)
|
Timber.i("Server minimum API version set to %s", restApiVersion)
|
||||||
|
|
||||||
// Execute a ping to check the authentication, now using the correct API version.
|
// Execute a ping to check the authentication, now using the correct API version.
|
||||||
pingResponse = client.api.pingSuspend()
|
client.api.pingSuspend()
|
||||||
return client
|
return client
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user