diff options
5 files changed, 46 insertions, 4 deletions
diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts index 413ab560..e013e9f8 100644 --- a/build-logic/android-plugins/build.gradle.kts +++ b/build-logic/android-plugins/build.gradle.kts @@ -3,11 +3,25 @@ * SPDX-License-Identifier: GPL-3.0-only */ +import org.gradle.api.JavaVersion +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.kotlin.dsl.withType +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` `kotlin-dsl-precompiled-script-plugins` } +tasks.withType<JavaCompile>().configureEach { + sourceCompatibility = JavaVersion.VERSION_11.toString() + targetCompatibility = JavaVersion.VERSION_11.toString() +} + +tasks.withType<KotlinCompile>().configureEach { + kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } +} + gradlePlugin { plugins { register("versioning") { diff --git a/build-logic/automation-plugins/build.gradle.kts b/build-logic/automation-plugins/build.gradle.kts index 2375262a..130b0807 100644 --- a/build-logic/automation-plugins/build.gradle.kts +++ b/build-logic/automation-plugins/build.gradle.kts @@ -3,11 +3,25 @@ * SPDX-License-Identifier: GPL-3.0-only */ +import org.gradle.api.JavaVersion +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.kotlin.dsl.withType +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` `kotlin-dsl-precompiled-script-plugins` } +tasks.withType<JavaCompile>().configureEach { + sourceCompatibility = JavaVersion.VERSION_11.toString() + targetCompatibility = JavaVersion.VERSION_11.toString() +} + +tasks.withType<KotlinCompile>().configureEach { + kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } +} + gradlePlugin { plugins { register("crowdin") { diff --git a/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts b/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts index f65f091a..abe0b65a 100644 --- a/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts +++ b/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts @@ -7,6 +7,6 @@ import org.gradle.api.tasks.wrapper.Wrapper import org.gradle.kotlin.dsl.withType tasks.withType<Wrapper> { - gradleVersion = "7.3.1" - distributionSha256Sum = "9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66" + gradleVersion = "7.3.3" + distributionSha256Sum = "b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302" } diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/kotlin-plugins/build.gradle.kts index d1c9a3af..8b1a1889 100644 --- a/build-logic/kotlin-plugins/build.gradle.kts +++ b/build-logic/kotlin-plugins/build.gradle.kts @@ -3,11 +3,25 @@ * SPDX-License-Identifier: GPL-3.0-only */ +import org.gradle.api.JavaVersion +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.kotlin.dsl.withType +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` `kotlin-dsl-precompiled-script-plugins` } +tasks.withType<JavaCompile>().configureEach { + sourceCompatibility = JavaVersion.VERSION_11.toString() + targetCompatibility = JavaVersion.VERSION_11.toString() +} + +tasks.withType<KotlinCompile>().configureEach { + kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } +} + dependencies { implementation(libs.build.agp) implementation(libs.build.binarycompat) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 93a3251c..59250647 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |