Upgrade to Java 17

airbnb · Sep 19, 2023 · a074df6 · a074df6
1 parent dd9a512
commit a074df6
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 50 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v1
         with:
           path: ~/.gradle/caches
@@ -31,10 +31,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout Branch
         uses: actions/checkout@v2
       - uses: actions/cache@v1
@@ -71,10 +71,10 @@ jobs:
         target: [ default, google_apis ]
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout Branch
         uses: actions/checkout@v2
       - uses: actions/cache@v1

diff --git a/sample-submodule-2/build.gradle b/sample-submodule-2/build.gradle
@@ -32,11 +32,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/sample-submodule/build.gradle b/sample-submodule/build.gradle
@@ -33,11 +33,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -38,11 +38,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-annotation/build.gradle b/showkase-annotation/build.gradle
@@ -5,13 +5,13 @@ plugins {
 apply from: "$rootDir/publishing.gradle"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

diff --git a/showkase-browser-testing-submodule-2/build.gradle b/showkase-browser-testing-submodule-2/build.gradle
@@ -30,11 +30,11 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-browser-testing-submodule/build.gradle b/showkase-browser-testing-submodule/build.gradle
@@ -30,11 +30,11 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-browser-testing/build.gradle b/showkase-browser-testing/build.gradle
@@ -44,11 +44,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-processor-testing/build.gradle b/showkase-processor-testing/build.gradle
@@ -27,11 +27,11 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-processor/build.gradle b/showkase-processor/build.gradle
@@ -5,13 +5,13 @@ plugins {
 apply from: "$rootDir/publishing.gradle"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

diff --git a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/BaseProcessor.kt b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/BaseProcessor.kt
@@ -42,7 +42,7 @@ abstract class BaseProcessor(
 
     fun isKsp(): Boolean = kspEnvironment != null
 
-    override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.RELEASE_11
+    override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.RELEASE_17
 
     override fun init(processingEnv: ProcessingEnvironment) {
         super.init(processingEnv)

diff --git a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/ShowkaseProcessor.kt b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/ShowkaseProcessor.kt
@@ -44,7 +44,7 @@ class ShowkaseProcessorProvider : SymbolProcessorProvider {
     }
 }
 
-@SupportedSourceVersion(SourceVersion.RELEASE_11) // to support Java 8
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 class ShowkaseProcessor @JvmOverloads constructor(
     kspEnvironment: SymbolProcessorEnvironment? = null
 ) : BaseProcessor(kspEnvironment) {

diff --git a/showkase-screenshot-testing-paparazzi-sample/build.gradle b/showkase-screenshot-testing-paparazzi-sample/build.gradle
@@ -39,11 +39,11 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-screenshot-testing-paparazzi/build.gradle b/showkase-screenshot-testing-paparazzi/build.gradle
@@ -53,11 +53,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
         freeCompilerArgs += [
                 '-Xopt-in=kotlin.RequiresOptIn',
         ]

diff --git a/showkase-screenshot-testing-shot/build.gradle b/showkase-screenshot-testing-shot/build.gradle
@@ -29,11 +29,11 @@ android {
         applicationId = "com.airbnb.android.showkase.screenshot.testing.shot"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase-screenshot-testing/build.gradle b/showkase-screenshot-testing/build.gradle
@@ -22,11 +22,11 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

diff --git a/showkase/build.gradle b/showkase/build.gradle
@@ -22,11 +22,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
         freeCompilerArgs += [
                 '-Xopt-in=kotlin.RequiresOptIn',
         ]