fix: Sweet spot JDK version for cross compile and Android SDK

WalkerKnapp · Jul 13, 2024 · 79fdfa4 · 79fdfa4
1 parent 070f8c6
commit 79fdfa4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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