From 126bed1a8b04a788fabc76dfa9037e10f6f71140 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Dec 2021 21:47:19 +0530
Subject: Upgrade to Gradle 7.3.3 (#1600)

* gradle: upgrade to 7.3.3

* build-logic: make Kotlin and Java targets match
---
 build-logic/automation-plugins/build.gradle.kts            | 14 ++++++++++++++
 .../com.github.android-password-store.gradle.gradle.kts    |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'build-logic/automation-plugins')

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"
 }
-- 
cgit v1.2.3