From 367c495f355713ee06f3705ecd987ccf352ab107 Mon Sep 17 00:00:00 2001 From: dhairya-quash Date: Wed, 4 Dec 2024 15:16:36 +0530 Subject: [PATCH] Updated gradle and jdk versions --- AnkiDroid/build.gradle | 6 +++--- api/build.gradle.kts | 6 +++--- common/build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- lint-rules/build.gradle.kts | 4 ++-- testlib/build.gradle.kts | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle index c0fc3b8..b552377 100644 --- a/AnkiDroid/build.gradle +++ b/AnkiDroid/build.gradle @@ -238,12 +238,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 coreLibraryDesugaringEnabled true } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11 + jvmTarget = JavaVersion.VERSION_17 } packagingOptions { diff --git a/api/build.gradle.kts b/api/build.gradle.kts index b856c1f..9c29e5e 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -46,14 +46,14 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { // enable explicit api mode for additional checks related to the public api // see https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors freeCompilerArgs += "-Xexplicit-api=strict" - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } publishing { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 641ee71..2c4b1bc 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -27,11 +27,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..7ff7174 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/lint-rules/build.gradle.kts b/lint-rules/build.gradle.kts index 1ce7311..b1578d8 100644 --- a/lint-rules/build.gradle.kts +++ b/lint-rules/build.gradle.kts @@ -6,8 +6,8 @@ plugins { } tasks.withType(JavaCompile::class).configureEach { - sourceCompatibility = JavaVersion.VERSION_11.toString() - targetCompatibility = JavaVersion.VERSION_11.toString() + sourceCompatibility = JavaVersion.VERSION_17.toString() + targetCompatibility = JavaVersion.VERSION_17.toString() } tasks.withType(KotlinCompile::class).all { diff --git a/testlib/build.gradle.kts b/testlib/build.gradle.kts index 4dc6b2e..bceb703 100644 --- a/testlib/build.gradle.kts +++ b/testlib/build.gradle.kts @@ -26,11 +26,11 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" }