From 3d15d019084bd8bb8ec3a9689c0a60bdce70e290 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 May 2024 21:35:21 +0000
Subject: [PATCH] Always validate the Gradle wrapper (#328)

* Always validate the Gradle wrapper

* Use preinstalled OpenJDK

---------

Co-authored-by: hfhbd <22521688+hfhbd@users.noreply.github.com>
---
 .github/workflows/AndroidIntegrationTest.yml |  2 +-
 .github/workflows/CD.yml                     |  2 +-
 .github/workflows/CI.yml                     |  3 ++-
 .github/workflows/Docs.yml                   |  2 +-
 .github/workflows/dependencies.yml           |  2 +-
 .github/workflows/gradleWrapper.yml          | 18 ------------------
 6 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 .github/workflows/gradleWrapper.yml

diff --git a/.github/workflows/AndroidIntegrationTest.yml b/.github/workflows/AndroidIntegrationTest.yml
index 8373516..c45d019 100644
--- a/.github/workflows/AndroidIntegrationTest.yml
+++ b/.github/workflows/AndroidIntegrationTest.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 21
       - uses: gradle/actions/setup-gradle@v3
         with:
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 612c6c1..2d3d436 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 21
       - uses: gradle/actions/setup-gradle@v3
       - name: Publish
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 2569eb3..26db199 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -20,10 +20,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 21
       - uses: gradle/actions/setup-gradle@v3
         with:
+          validate-wrappers: true
           gradle-home-cache-cleanup: true
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
index 55917e6..ea695ea 100644
--- a/.github/workflows/Docs.yml
+++ b/.github/workflows/Docs.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 21
       - uses: gradle/actions/setup-gradle@v3
       - name: Generate Docs
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index 33e8124..1ff3a8c 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 21
       - name: Generate and submit dependency graph
         uses: gradle/actions/dependency-submission@v3
diff --git a/.github/workflows/gradleWrapper.yml b/.github/workflows/gradleWrapper.yml
deleted file mode 100644
index 097dc82..0000000
--- a/.github/workflows/gradleWrapper.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Gradle Wrapper Validation
-
-on:
-  pull_request:
-    paths:
-      - 'gradlew'
-      - 'gradlew.bat'
-      - 'gradle/wrapper/'
-
-jobs:
-  validateWrapper:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2