Revert JDK version to 1.8 for Camera2Basic

cartland · cartland · commit 7f2df5d999ae · 2025-07-10T15:47:25.000-07:00
This commit reverts the JDK version used for the Camera2Basic
project to 1.8. This change addresses compatibility issues
encountered with the newer JDK 17.

The following changes were made:

- Modified `Camera2Basic/build.gradle` to use `VERSION_1_8`.
- Removed `org.gradle.java.home` from
  `Camera2Basic/gradle.properties`.
- Removed `org.gradle.java.home` from
  `CameraXExtensions/gradle.properties`.
- Added `.java-version` files to specify java versions.
diff --git a/.github/scripts/gradlew_recursive.sh b/.github/scripts/gradlew_recursive.sh
@@ -20,6 +20,12 @@ set -xe
 # You may edit this if your repo has a different project structure
 for GRADLEW in `find . -name "gradlew"` ; do
     SAMPLE=$(dirname "${GRADLEW}")
+    # Initialize jenv to manage Java versions
+    if command -v jenv &> /dev/null; then
+        pushd "$SAMPLE"
+        eval "$(jenv init -)"
+        popd
+    fi
     # Tell Gradle that this is a CI environment and disable parallel compilation
     bash "$GRADLEW" -p "$SAMPLE" -Pci --no-parallel --stacktrace $@
 done
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -40,8 +40,7 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
       - name: Build project
-        run: |
-          .github/scripts/gradlew_recursive.sh assembleDebug
+        run: .github/scripts/gradlew_recursive.sh assembleDebug
       - name: Zip artifacts
         run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
       - name: Upload artifacts
diff --git a/Camera2Basic/.java-version b/Camera2Basic/.java-version
@@ -0,0 +1 @@
+17
diff --git a/Camera2Basic/build.gradle b/Camera2Basic/build.gradle
@@ -19,7 +19,7 @@
 buildscript {
     // Top-level variables used for versioning
     ext.kotlin_version = '1.9.20'
-    ext.java_version = JavaVersion.VERSION_17
+    ext.java_version = JavaVersion.VERSION_1_8
 
     repositories {
         google()
diff --git a/Camera2Basic/gradle.properties b/Camera2Basic/gradle.properties
@@ -1,4 +1,22 @@
 
-org.gradle.java.home=/Users/cartland/.jenv/versions/17
-android.useAndroidX=true
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
 android.enableJetifier=true
+android.useAndroidX=true
diff --git a/CameraXExtensions/.java-version b/CameraXExtensions/.java-version
@@ -0,0 +1 @@
+17
diff --git a/CameraXExtensions/gradle.properties b/CameraXExtensions/gradle.properties
@@ -38,5 +38,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
-org.gradle.java.home=/Users/cartland/.jenv/versions/17
+android.nonFinalResIds=false
