Merge pull request #968 from square/rick/artifactsDump_jdk_int

prioritize `JavaCompile.Options.release` and Android `CompileOptions` when parsing an artifact jdk version

Author: RBusarow

artifacts.json

@@ -5,7 +5,7 @@
     "artifactId": "workflow-internal-testing-utils",
     "description": "Workflow internal testing utilities",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -14,7 +14,7 @@
     "artifactId": "trace-encoder",
     "description": "Trace Encoder",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -23,7 +23,7 @@
     "artifactId": "workflow-core-iosarm64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "iosArm64"
   },
   {
@@ -32,7 +32,7 @@
     "artifactId": "workflow-core-iossimulatorarm64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -41,7 +41,7 @@
     "artifactId": "workflow-core-iosx64",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "iosX64"
   },
   {
@@ -50,7 +50,7 @@
     "artifactId": "workflow-core-js",
     "description": "Workflow Core",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "js"
   },
   {
@@ -59,7 +59,7 @@
     "artifactId": "workflow-core-jvm",
     "description": "Workflow Core",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "jvm"
   },
   {
@@ -68,7 +68,7 @@
     "artifactId": "workflow-core",
     "description": "Workflow Core",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
   {
@@ -77,7 +77,7 @@
     "artifactId": "workflow-runtime-iosarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "iosArm64"
   },
   {
@@ -86,7 +86,7 @@
     "artifactId": "workflow-runtime-iossimulatorarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -95,7 +95,7 @@
     "artifactId": "workflow-runtime-iosx64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "iosX64"
   },
   {
@@ -104,7 +104,7 @@
     "artifactId": "workflow-runtime-js",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "js"
   },
   {
@@ -113,7 +113,7 @@
     "artifactId": "workflow-runtime-jvm",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "jvm"
   },
   {
@@ -122,7 +122,7 @@
     "artifactId": "workflow-runtime",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
   {
@@ -131,7 +131,7 @@
     "artifactId": "workflow-rx2",
     "description": "Workflow RxJava2",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -140,7 +140,7 @@
     "artifactId": "workflow-testing-jvm",
     "description": "Workflow Testing",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -149,7 +149,7 @@
     "artifactId": "workflow-tracing",
     "description": "Workflow Tracing",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -158,7 +158,7 @@
     "artifactId": "workflow-config-android",
     "description": "Workflow Runtime Android Configuration",
     "packaging": "aar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -167,7 +167,7 @@
     "artifactId": "workflow-config-jvm",
     "description": "Workflow Runtime JVM Configuration",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -176,7 +176,7 @@
     "artifactId": "workflow-ui-compose",
     "description": "Workflow UI Compose",
     "packaging": "aar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -185,7 +185,7 @@
     "artifactId": "workflow-ui-compose-tooling",
     "description": "Workflow UI Compose Tooling",
     "packaging": "aar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -194,7 +194,7 @@
     "artifactId": "workflow-ui-container-android",
     "description": "Workflow UI Container Android",
     "packaging": "aar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -203,7 +203,7 @@
     "artifactId": "workflow-ui-container-common-jvm",
     "description": "Workflow UI Container",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -212,7 +212,7 @@
     "artifactId": "workflow-ui-core-android",
     "description": "Workflow UI Android",
     "packaging": "aar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -221,7 +221,7 @@
     "artifactId": "workflow-ui-core-common-jvm",
     "description": "Workflow UI Core",
     "packaging": "jar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   },
   {
@@ -230,7 +230,7 @@
     "artifactId": "workflow-ui-radiography",
     "description": "Workflow UI Radiography Support",
     "packaging": "aar",
-    "javaVersion": "1.8",
+    "javaVersion": 8,
     "publicationName": "maven"
   }
-]
+]

buildSrc/src/main/java/com/squareup/workflow1/buildsrc/artifacts/ArtifactConfig.kt

@@ -28,7 +28,7 @@ data class ArtifactConfig(
   val artifactId: String,
   val description: String,
   val packaging: String,
-  val javaVersion: String,
+  val javaVersion: Int,
   val publicationName: String
 ) : Serializable {
   val key = "$gradlePath+$publicationName"

buildSrc/src/main/java/com/squareup/workflow1/buildsrc/artifacts/ArtifactsCheckTask.kt

@@ -11,7 +11,6 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
-import org.gradle.kotlin.dsl.property
 import java.util.Locale
 import javax.inject.Inject
 
@@ -31,7 +30,8 @@ open class ArtifactsCheckTask @Inject constructor(
     group = "verification"
   }
 
-  private val lenientOsProp: Property<Boolean> = objectFactory.property()
+  private val lenientOsProp: Property<Boolean> = objectFactory.property(Boolean::class.java)
+    .convention(false)
 
   @set:Option(
     option = "lenient-os",
@@ -181,7 +181,9 @@ open class ArtifactsCheckTask @Inject constructor(
       appendLine("\tDuplicate properties were found where they should be unique:")
       appendLine()
       duplicates.forEach { (value, artifacts) ->
-        appendLine("\t\t       projects - ${artifacts.map { "${it.gradlePath} (${it.publicationName})" }}")
+        appendLine(
+          "\t\t       projects - ${artifacts.map { "${it.gradlePath} (${it.publicationName})" }}"
+        )
         appendLine("\t\t       property - $propertyName")
         appendLine("\t\tduplicate value - $value")
         appendLine()
@@ -261,8 +263,11 @@ open class ArtifactsCheckTask @Inject constructor(
   }
 
   private fun pluralsString(size: Int): String {
-    return if (size == 1) "This artifact is"
-    else "These artifacts are"
+    return if (size == 1) {
+      "This artifact is"
+    } else {
+      "These artifacts are"
+    }
   }
 
   private fun ArtifactConfig.message(): String {

buildSrc/src/main/java/com/squareup/workflow1/buildsrc/artifacts/ArtifactsTask.kt

@@ -1,5 +1,6 @@
 package com.squareup.workflow1.buildsrc.artifacts
 
+import com.android.build.gradle.TestedExtension
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
@@ -12,7 +13,7 @@ import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.api.tasks.compile.JavaCompile
 
 abstract class ArtifactsTask(
   private val projectLayout: ProjectLayout
@@ -83,9 +84,7 @@ abstract class ArtifactsTask(
           .takeIf { it.size == 4 }
           ?.let { (group, artifactId, pomDescription, packaging) ->
 
-            val javaVersion = sub.extensions.getByType(JavaPluginExtension::class)
-              .sourceCompatibility
-              .toString()
+            val javaVersion = sub.getJavaReleaseVersion()
 
             ArtifactConfig(
               gradlePath = sub.path,
@@ -101,4 +100,43 @@ abstract class ArtifactsTask(
 
     return map
   }
+
+  /**
+   * Determines the JDK version which will be used for published artifacts.
+   *
+   * The JDK version is the first non-null value of:
+   * 1. [JavaCompile.Options.release]
+   * 2. (for Android) [com.android.build.gradle.internal.CompileOptions.getTargetCompatibility]
+   * 3. [org.gradle.api.plugins.JavaPluginExtension.getTargetCompatibility.getMajorVersion]
+   */
+  private fun Project.getJavaReleaseVersion(): Int {
+    val releaseVersion = tasks.withType(JavaCompile::class.java)
+      .mapNotNull { it.options.release.orNull }
+      .distinct()
+      .also { versions ->
+        check(versions.size < 2) {
+          "Multiple JDK release versions are not supported.  We found: $versions"
+        }
+      }
+      .singleOrNull()
+
+    if (releaseVersion != null) {
+      return releaseVersion
+    }
+
+    val androidVersion = extensions.findByType(TestedExtension::class.java)
+      ?.compileOptions
+      ?.targetCompatibility
+      ?.majorVersion
+
+    if (androidVersion != null) {
+      return androidVersion.toInt()
+    }
+
+    return extensions
+      .getByType(JavaPluginExtension::class.java)
+      .targetCompatibility
+      .majorVersion
+      .toInt()
+  }
 }