diff --git a/build.gradle b/build.gradle index 0e2c097b..645a8825 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ allprojects { // Set Kotlin JVM target to the same for all subprojects tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1d2efe6e..63a02374 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] # You need to run ./gradlew wrapper after updating the version -gradle = "7.5.1" +gradle = "7.6" navigation = "2.5.3" -gradlePlugin = "7.3.1" +gradlePlugin = "7.4.0" androidxcore = "1.9.0" ktlint = "0.43.2" ktlintGradle = "11.0.0" diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index 93919145..c771441c 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/gradle_scripts/android-module-bootstrap.gradle @@ -16,9 +16,8 @@ android { } compileOptions { - // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } sourceSets { diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle index 1b90102b..5c991fcf 100644 --- a/gradle_scripts/code_quality.gradle +++ b/gradle_scripts/code_quality.gradle @@ -29,7 +29,7 @@ if (isCodeQualityEnabled) { config = files("${rootProject.projectDir}/detekt-config.yml") } } - tasks.detekt.jvmTarget = "1.8" + tasks.detekt.jvmTarget = "11" } } diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 270d87c2..0dff501c 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -50,7 +50,7 @@ android { } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } buildFeatures { @@ -59,8 +59,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kapt { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt index 24a876df..c7e51723 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt @@ -119,13 +119,13 @@ class EditServerModel(val app: Application) : AndroidViewModel(app), KoinCompone // Execute a ping to retrieve the API version. // 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 serverSetting.minimumApiVersion = restApiVersion Timber.i("Server minimum API version set to %s", restApiVersion) // Execute a ping to check the authentication, now using the correct API version. - pingResponse = client.api.pingSuspend() + client.api.pingSuspend() return client }