Update Java to Java 17

square · Oct 20, 2023 · 0218aca · 0218aca
1 parent b3224fc
commit 0218aca
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 62 deletions.
diff --git a/artifacts.json b/artifacts.json
@@ -5,7 +5,7 @@
     "artifactId": "workflow-internal-testing-utils",
     "description": "Workflow internal testing utilities",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -14,7 +14,7 @@
     "artifactId": "trace-encoder",
     "description": "Trace Encoder",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -23,7 +23,7 @@
     "artifactId": "workflow-core-iosarm64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosArm64"
   },
   {
@@ -32,7 +32,7 @@
     "artifactId": "workflow-core-iossimulatorarm64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -41,7 +41,7 @@
     "artifactId": "workflow-core-iosx64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosX64"
   },
   {
@@ -50,7 +50,7 @@
     "artifactId": "workflow-core-js",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "js"
   },
   {
@@ -59,7 +59,7 @@
     "artifactId": "workflow-core-jvm",
     "description": "Workflow Core",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "jvm"
   },
   {
@@ -68,7 +68,7 @@
     "artifactId": "workflow-core",
     "description": "Workflow Core",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "kotlinMultiplatform"
   },
   {
@@ -77,7 +77,7 @@
     "artifactId": "workflow-runtime-iosarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosArm64"
   },
   {
@@ -86,7 +86,7 @@
     "artifactId": "workflow-runtime-iossimulatorarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -95,7 +95,7 @@
     "artifactId": "workflow-runtime-iosx64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosX64"
   },
   {
@@ -104,7 +104,7 @@
     "artifactId": "workflow-runtime-js",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "js"
   },
   {
@@ -113,7 +113,7 @@
     "artifactId": "workflow-runtime-jvm",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "jvm"
   },
   {
@@ -122,7 +122,7 @@
     "artifactId": "workflow-runtime",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "kotlinMultiplatform"
   },
   {
@@ -131,7 +131,7 @@
     "artifactId": "workflow-rx2",
     "description": "Workflow RxJava2",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -140,7 +140,7 @@
     "artifactId": "workflow-testing-jvm",
     "description": "Workflow Testing",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -149,7 +149,7 @@
     "artifactId": "workflow-tracing",
     "description": "Workflow Tracing",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -158,7 +158,7 @@
     "artifactId": "workflow-config-android",
     "description": "Workflow Runtime Android Configuration",
     "packaging": "aar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -167,7 +167,7 @@
     "artifactId": "workflow-config-jvm",
     "description": "Workflow Runtime JVM Configuration",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -176,7 +176,7 @@
     "artifactId": "workflow-ui-compose",
     "description": "Workflow UI Compose",
     "packaging": "aar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -185,7 +185,7 @@
     "artifactId": "workflow-ui-compose-tooling",
     "description": "Workflow UI Compose Tooling",
     "packaging": "aar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -194,7 +194,7 @@
     "artifactId": "workflow-ui-container-android",
     "description": "Workflow UI Container Android",
     "packaging": "aar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -203,7 +203,7 @@
     "artifactId": "workflow-ui-container-common-jvm",
     "description": "Workflow UI Container",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -212,7 +212,7 @@
     "artifactId": "workflow-ui-core-android",
     "description": "Workflow UI Android",
     "packaging": "aar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -221,7 +221,7 @@
     "artifactId": "workflow-ui-core-common-jvm",
     "description": "Workflow UI Core",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   },
   {
@@ -230,7 +230,7 @@
     "artifactId": "workflow-ui-radiography",
     "description": "Workflow UI Radiography Support",
     "packaging": "aar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "maven"
   }
 ]
diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts
@@ -13,12 +13,12 @@ android {
   compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "17"
     freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
   }
 

diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts
@@ -13,12 +13,12 @@ android {
   compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "17"
     freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
   }
 

diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts
@@ -10,12 +10,12 @@ android {
   compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "17"
   }
 
   defaultConfig {

diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidDefaultsPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidDefaultsPlugin.kt
@@ -3,7 +3,7 @@ package com.squareup.workflow1.buildsrc
 import com.android.build.gradle.TestedExtension
 import com.squareup.workflow1.buildsrc.internal.libsCatalog
 import com.squareup.workflow1.buildsrc.internal.version
-import org.gradle.api.JavaVersion.VERSION_1_8
+import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -17,8 +17,8 @@ class AndroidDefaultsPlugin : Plugin<Project> {
 
       testedExtension.compileOptions { compileOptions ->
 
-        compileOptions.sourceCompatibility = VERSION_1_8
-        compileOptions.targetCompatibility = VERSION_1_8
+        compileOptions.sourceCompatibility = VERSION_17
+        compileOptions.targetCompatibility = VERSION_17
       }
 
       testedExtension.defaultConfig { defaultConfig ->

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,8 +6,8 @@ compileSdk = "33"
 minSdk = "21"
 targetSdk = "33"
 
-jdk-target = "8"
-jdk-toolchain = "11"
+jdk-target = "17"
+jdk-toolchain = "17"
 
 androidx-activity = "1.6.1"
 androidx-appcompat = "1.6.1"

diff --git a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/BoardView.kt b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/BoardView.kt
@@ -27,7 +27,10 @@ class BoardView(context: Context) : View(context) {
   private val textPaint = Paint().apply {
     // Set the text color correctly in case the map contains regular text characters (emojis ignore
     // the text paint color).
-    color = ContextCompat.getColor(context, R.color.design_default_color_on_primary)
+    color = ContextCompat.getColor(
+      context,
+      com.google.android.material.R.color.design_default_color_on_primary
+    )
   }
   private val glyphBounds = Rect()
   private var board: Board? = null

diff --git a/samples/tutorial/tutorial-1-complete/build.gradle b/samples/tutorial/tutorial-1-complete/build.gradle
@@ -17,11 +17,11 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = '17'
   }
   namespace 'workflow.tutorial'
 }

diff --git a/samples/tutorial/tutorial-2-complete/build.gradle b/samples/tutorial/tutorial-2-complete/build.gradle
@@ -17,11 +17,11 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = '17'
   }
   namespace 'workflow.tutorial'
 }

diff --git a/samples/tutorial/tutorial-3-complete/build.gradle b/samples/tutorial/tutorial-3-complete/build.gradle
@@ -17,11 +17,11 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = '17'
   }
   namespace 'workflow.tutorial'
 }

diff --git a/samples/tutorial/tutorial-4-complete/build.gradle b/samples/tutorial/tutorial-4-complete/build.gradle
@@ -17,11 +17,11 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = '17'
   }
   namespace 'workflow.tutorial'
 }