Merge pull request #1133 from square/rick/better-java-version-handling

revert jdk target to 1.8
square · Oct 25, 2023 · f5892fa · f5892fa
2 parents a073005 + b3979e9
commit f5892fa
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 106 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": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -14,7 +14,7 @@
     "artifactId": "trace-encoder",
     "description": "Trace Encoder",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -23,7 +23,7 @@
     "artifactId": "workflow-core-iosarm64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "iosArm64"
   },
   {
@@ -32,7 +32,7 @@
     "artifactId": "workflow-core-iossimulatorarm64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -41,7 +41,7 @@
     "artifactId": "workflow-core-iosx64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "iosX64"
   },
   {
@@ -50,7 +50,7 @@
     "artifactId": "workflow-core-js",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "js"
   },
   {
@@ -59,7 +59,7 @@
     "artifactId": "workflow-core-jvm",
     "description": "Workflow Core",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "jvm"
   },
   {
@@ -68,7 +68,7 @@
     "artifactId": "workflow-core",
     "description": "Workflow Core",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
   {
@@ -77,7 +77,7 @@
     "artifactId": "workflow-runtime-iosarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "iosArm64"
   },
   {
@@ -86,7 +86,7 @@
     "artifactId": "workflow-runtime-iossimulatorarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -95,7 +95,7 @@
     "artifactId": "workflow-runtime-iosx64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "iosX64"
   },
   {
@@ -104,7 +104,7 @@
     "artifactId": "workflow-runtime-js",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "js"
   },
   {
@@ -113,7 +113,7 @@
     "artifactId": "workflow-runtime-jvm",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "jvm"
   },
   {
@@ -122,7 +122,7 @@
     "artifactId": "workflow-runtime",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
   {
@@ -131,7 +131,7 @@
     "artifactId": "workflow-rx2",
     "description": "Workflow RxJava2",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -140,7 +140,7 @@
     "artifactId": "workflow-testing-jvm",
     "description": "Workflow Testing",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -149,7 +149,7 @@
     "artifactId": "workflow-tracing",
     "description": "Workflow Tracing",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -158,7 +158,7 @@
     "artifactId": "workflow-config-android",
     "description": "Workflow Runtime Android Configuration",
     "packaging": "aar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -167,7 +167,7 @@
     "artifactId": "workflow-config-jvm",
     "description": "Workflow Runtime JVM Configuration",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -176,7 +176,7 @@
     "artifactId": "workflow-ui-compose",
     "description": "Workflow UI Compose",
     "packaging": "aar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -185,7 +185,7 @@
     "artifactId": "workflow-ui-compose-tooling",
     "description": "Workflow UI Compose Tooling",
     "packaging": "aar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -194,7 +194,7 @@
     "artifactId": "workflow-ui-container-android",
     "description": "Workflow UI Container Android",
     "packaging": "aar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -203,7 +203,7 @@
     "artifactId": "workflow-ui-container-common-jvm",
     "description": "Workflow UI Container",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -212,7 +212,7 @@
     "artifactId": "workflow-ui-core-android",
     "description": "Workflow UI Android",
     "packaging": "aar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -221,7 +221,7 @@
     "artifactId": "workflow-ui-core-common-jvm",
     "description": "Workflow UI Core",
     "packaging": "jar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -230,7 +230,7 @@
     "artifactId": "workflow-ui-radiography",
     "description": "Workflow UI Radiography Support",
     "packaging": "aar",
-    "javaVersion": 17,
+    "javaVersion": 8,
     "publicationName": "maven"
   }
 ]
diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts
@@ -1,5 +1,7 @@
-import com.squareup.workflow1.buildsrc.internal.libsCatalog
-import com.squareup.workflow1.buildsrc.internal.version
+import com.rickbusarow.kgx.libsCatalog
+import com.rickbusarow.kgx.version
+import com.squareup.workflow1.buildsrc.internal.javaTarget
+import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
 
 plugins {
   id("com.android.test")
@@ -13,12 +15,12 @@ android {
   compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
 
   kotlinOptions {
-    jvmTarget = "17"
+    jvmTarget = javaTarget
     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
@@ -1,5 +1,7 @@
-import com.squareup.workflow1.buildsrc.internal.libsCatalog
-import com.squareup.workflow1.buildsrc.internal.version
+import com.rickbusarow.kgx.libsCatalog
+import com.rickbusarow.kgx.version
+import com.squareup.workflow1.buildsrc.internal.javaTarget
+import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
 
 plugins {
   id("com.android.test")
@@ -13,12 +15,12 @@ android {
   compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
 
   kotlinOptions {
-    jvmTarget = "17"
+    jvmTarget = javaTarget
     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
@@ -1,5 +1,7 @@
-import com.squareup.workflow1.buildsrc.internal.libsCatalog
-import com.squareup.workflow1.buildsrc.internal.version
+import com.rickbusarow.kgx.libsCatalog
+import com.rickbusarow.kgx.version
+import com.squareup.workflow1.buildsrc.internal.javaTarget
+import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
 
 plugins {
   id("com.android.application")
@@ -10,12 +12,12 @@ android {
   compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
 
   kotlinOptions {
-    jvmTarget = "17"
+    jvmTarget = javaTarget
   }
 
   defaultConfig {

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -63,6 +63,7 @@ dependencies {
   compileOnly(gradleApi())
 
   implementation(libs.android.gradle.plugin)
+  implementation(libs.kgx)
   implementation(libs.dokka.gradle.plugin)
   implementation(libs.dropbox.dependencyGuard)
   implementation(libs.kotlin.gradle.plugin)

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
@@ -1,9 +1,9 @@
 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_17
+import com.rickbusarow.kgx.libsCatalog
+import com.rickbusarow.kgx.version
+import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -17,8 +17,8 @@ class AndroidDefaultsPlugin : Plugin<Project> {
 
       testedExtension.compileOptions { compileOptions ->
 
-        compileOptions.sourceCompatibility = VERSION_17
-        compileOptions.targetCompatibility = VERSION_17
+        compileOptions.sourceCompatibility = target.javaTargetVersion
+        compileOptions.targetCompatibility = target.javaTargetVersion
       }
 
       testedExtension.defaultConfig { defaultConfig ->
@@ -30,7 +30,6 @@ class AndroidDefaultsPlugin : Plugin<Project> {
 
       testedExtension.testOptions { testOptions ->
         testOptions.unitTests { unitTestOptions ->
-
           unitTestOptions.isReturnDefaultValues = true
           unitTestOptions.isIncludeAndroidResources = true
         }

diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt
@@ -2,10 +2,10 @@ package com.squareup.workflow1.buildsrc
 
 import com.android.build.gradle.TestedExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import com.rickbusarow.kgx.dependency
+import com.rickbusarow.kgx.libsCatalog
 import com.squareup.workflow1.buildsrc.internal.implementation
 import com.squareup.workflow1.buildsrc.internal.invoke
-import com.squareup.workflow1.buildsrc.internal.library
-import com.squareup.workflow1.buildsrc.internal.libsCatalog
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -31,8 +31,8 @@ class AndroidSampleAppPlugin : Plugin<Project> {
       implementation(target.project(":workflow-runtime"))
       implementation(target.project(":workflow-config:config-android"))
 
-      implementation(target.libsCatalog.library("androidx-appcompat"))
-      implementation(target.libsCatalog.library("timber"))
+      implementation(target.libsCatalog.dependency("androidx-appcompat"))
+      implementation(target.libsCatalog.dependency("timber"))
     }
   }
 }