fix: bring back Java 8 compatibility (#267)

* fix: bring back Java 8 compatibility * build: Compile with latest JDK * build: Suppress deprecated target version warning on Java 21
googlemaps · Jul 9, 2024 · fded4c0 · fded4c0
1 parent a9488f6
commit fded4c0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -31,10 +31,10 @@ jobs:
     - name: Checkout android-maps-ktx
       uses: actions/checkout@v3
 
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     # Run dokka and create tar

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,10 +22,10 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Checkout
       uses: actions/checkout@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,10 +37,10 @@ jobs:
     - name: Gradle Wrapper Validation
       uses: gradle/[email protected]
 
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     - name: Build modules

diff --git a/app/build.gradle b/app/build.gradle
@@ -43,18 +43,17 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "1.8"
     }
     namespace 'com.google.maps.android.ktx.demo'
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation libs.kotlinStdlib
     implementation libs.androidxAppcompat
     implementation libs.androidxCoreKtx

diff --git a/build.gradle b/build.gradle
@@ -91,7 +91,7 @@ subprojects { project ->
 
     // Code coverage
     jacoco {
-        toolVersion = "0.8.7"
+        toolVersion = "0.8.12"
     }
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -31,4 +31,7 @@ sonatypeTokenPassword=
 
 # Migration to AGP 8.2.1
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonFinalResIds=false
+
+# Despite being deprecated, targeting lowest java version is needed to support old Android runtime
+android.javaCompile.suppressSourceTargetDeprecationWarning=true
diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle
@@ -29,13 +29,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
-        jvmTarget = "17"
+        jvmTarget = "1.8"
     }
     buildFeatures {
         viewBinding true

diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle
@@ -34,13 +34,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
-        jvmTarget = "17"
+        jvmTarget = "1.8"
     }
     buildFeatures {
         viewBinding true