From 79fdfa4ec9114c5bc96972295374e5cddd3bb0c6 Mon Sep 17 00:00:00 2001
From: Walker Knapp <walker@walkerknapp.me>
Date: Sat, 13 Jul 2024 15:42:31 -0400
Subject: [PATCH] fix: Sweet spot JDK version for cross compile and Android SDK

---
 .github/workflows/gradle.yml             | 4 ++--
 .github/workflows/release.yml            | 4 ++--
 examples/build.gradle                    | 2 --
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 4267192..6b8ca1e 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -13,10 +13,10 @@ jobs:
     - name: Install innoextract
       run: wget https://constexpr.org/innoextract/files/innoextract-1.9-linux.tar.xz && sudo tar --directory=/opt -xvf innoextract-1.9-linux.tar.xz
 
-    - name: Set up JDK 17
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '11'
         distribution: 'temurin'
 
     - name: Setup Android SDK
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a49b48..e3dde49 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Install innoextract
         run: wget https://constexpr.org/innoextract/files/innoextract-1.9-linux.tar.xz && sudo tar --directory=/opt -xvf innoextract-1.9-linux.tar.xz
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'temurin'
 
       - name: Setup Android SDK
diff --git a/examples/build.gradle b/examples/build.gradle
index 6884f45..2db8c03 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -14,8 +14,6 @@ dependencies {
     implementation project(":devolay-java")
     implementation group: 'org.bytedeco', name: 'ffmpeg-platform', version: '4.2.1-1.5.2'
     //runtimeOnly project(":devolay-natives")
-
-    testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
 task executeSendAudioExample(type:JavaExec) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8017aef..de7e795 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://github.com/WalkerKnapp/gradle/releases/download/v6.7.1/gradle-6.7-all.zip
+distributionUrl=https://github.com/WalkerKnapp/gradle/releases/download/v7.2cc/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists