From 736f84acb4e17cc651d82e768b2bd393a815c0b1 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 23 Dec 2021 17:52:17 +0530
Subject: Misc cleanups and fixes (#1611)

---
 .github/workflows/update_publicsuffix_data.yml  |  2 +-
 build-logic/android-plugins/build.gradle.kts    | 14 ++++++++------
 build-logic/automation-plugins/build.gradle.kts | 14 ++++++++------
 build-logic/kotlin-plugins/build.gradle.kts     | 14 ++++++++------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml
index a124bef2..f3d5b156 100644
--- a/.github/workflows/update_publicsuffix_data.yml
+++ b/.github/workflows/update_publicsuffix_data.yml
@@ -27,7 +27,7 @@ jobs:
         run: if [[ $(git diff --binary --stat) != '' ]]; then echo "UPDATED=true" >> $GITHUB_ENV; fi
 
       - name: Verify update publicsuffixes file
-        uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+        uses: gradle/gradle-build-action@v2.0.1
         if: env.UPDATED == 'true'
         with:
           arguments: :autofill-parser:test -PslimTests
diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts
index e013e9f8..8c4315dd 100644
--- a/build-logic/android-plugins/build.gradle.kts
+++ b/build-logic/android-plugins/build.gradle.kts
@@ -13,13 +13,15 @@ plugins {
   `kotlin-dsl-precompiled-script-plugins`
 }
 
-tasks.withType<JavaCompile>().configureEach {
-  sourceCompatibility = JavaVersion.VERSION_11.toString()
-  targetCompatibility = JavaVersion.VERSION_11.toString()
-}
+afterEvaluate {
+  tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
+  }
 
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  }
 }
 
 gradlePlugin {
diff --git a/build-logic/automation-plugins/build.gradle.kts b/build-logic/automation-plugins/build.gradle.kts
index 130b0807..15c5baa9 100644
--- a/build-logic/automation-plugins/build.gradle.kts
+++ b/build-logic/automation-plugins/build.gradle.kts
@@ -13,13 +13,15 @@ plugins {
   `kotlin-dsl-precompiled-script-plugins`
 }
 
-tasks.withType<JavaCompile>().configureEach {
-  sourceCompatibility = JavaVersion.VERSION_11.toString()
-  targetCompatibility = JavaVersion.VERSION_11.toString()
-}
+afterEvaluate {
+  tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
+  }
 
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  }
 }
 
 gradlePlugin {
diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/kotlin-plugins/build.gradle.kts
index 8b1a1889..229c5f17 100644
--- a/build-logic/kotlin-plugins/build.gradle.kts
+++ b/build-logic/kotlin-plugins/build.gradle.kts
@@ -13,13 +13,15 @@ plugins {
   `kotlin-dsl-precompiled-script-plugins`
 }
 
-tasks.withType<JavaCompile>().configureEach {
-  sourceCompatibility = JavaVersion.VERSION_11.toString()
-  targetCompatibility = JavaVersion.VERSION_11.toString()
-}
+afterEvaluate {
+  tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
+  }
 
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  }
 }
 
 dependencies {
-- 
cgit v1.2.3