Merge pull request #813 from square/rick/only_apply_kotlin_bom_once

always add the Kotlin bom dependency, and only add it once

Author: RBusarow

buildSrc/src/main/java/com/squareup/workflow1/buildsrc/KotlinCommonSettings.kt

@@ -3,6 +3,7 @@ package com.squareup.workflow1.buildsrc
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.kotlin
+import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // See https://stackoverflow.com/questions/25324880/detect-ide-environment-with-gradle
@@ -11,35 +12,38 @@ val Project.isRunningFromIde
 
 @Suppress("SuspiciousCollectionReassignment")
 fun Project.kotlinCommonSettings(
-  compileTask: KotlinCompile,
-  configuration: String = "implementation",
+  bomConfigurationName: String
 ) {
 
   // force the same Kotlin version everywhere, including transitive dependencies
   dependencies {
-    configuration(platform(kotlin("bom")))
+    bomConfigurationName(platform(kotlin("bom")))
   }
 
-  compileTask.kotlinOptions {
+  tasks.withType<KotlinCompile> {
+    kotlinOptions {
 
-    // Allow warnings when running from IDE, makes it easier to experiment.
-    if (!isRunningFromIde) {
-      allWarningsAsErrors = true
-    }
+      jvmTarget = "1.8"
 
-    // Don't panic, all this does is allow us to use the @OptIn meta-annotation.
-    // to define our own experiments.
-    freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+      // Allow warnings when running from IDE, makes it easier to experiment.
+      if (!isRunningFromIde) {
+        allWarningsAsErrors = true
+      }
 
-    // Make sure our module names don't conflict with those from pre-workflow1
-    // releases, so that old and new META-INF/ entries don't stomp each other.
-    // (This is only an issue for apps that are still migrating from workflow to
-    // workflow1, and so need to import two versions of the library.)
-    // https://blog.jetbrains.com/kotlin/2015/09/kotlin-m13-is-out/
-    moduleName = "wf1-${project.name}"
-  }
+      // Don't panic, all this does is allow us to use the @OptIn meta-annotation.
+      // to define our own experiments.
+      freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
 
-  maybeEnableExplicitApi(compileTask)
+      // Make sure our module names don't conflict with those from pre-workflow1
+      // releases, so that old and new META-INF/ entries don't stomp each other.
+      // (This is only an issue for apps that are still migrating from workflow to
+      // workflow1, and so need to import two versions of the library.)
+      // https://blog.jetbrains.com/kotlin/2015/09/kotlin-m13-is-out/
+      moduleName = "wf1-${project.name}"
+    }
+
+    maybeEnableExplicitApi(this@withType)
+  }
 }
 
 private fun Project.maybeEnableExplicitApi(compileTask: KotlinCompile) {

buildSrc/src/main/java/kotlin-android.gradle.kts

@@ -1,5 +1,4 @@
 import com.squareup.workflow1.buildsrc.kotlinCommonSettings
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   kotlin("android")
@@ -10,10 +9,4 @@ extensions.getByType(JavaPluginExtension::class).apply {
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-  }
-
-  project.kotlinCommonSettings(this)
-}
+project.kotlinCommonSettings(bomConfigurationName = "implementation")

buildSrc/src/main/java/kotlin-jvm.gradle.kts

@@ -1,5 +1,4 @@
 import com.squareup.workflow1.buildsrc.kotlinCommonSettings
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   kotlin("jvm")
@@ -10,10 +9,4 @@ extensions.getByType(JavaPluginExtension::class).apply {
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-  }
-
-  project.kotlinCommonSettings(this)
-}
+project.kotlinCommonSettings(bomConfigurationName = "implementation")

buildSrc/src/main/java/kotlin-multiplatform.gradle.kts

@@ -1,5 +1,4 @@
 import com.squareup.workflow1.buildsrc.kotlinCommonSettings
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   kotlin("multiplatform")
@@ -10,10 +9,4 @@ extensions.getByType(JavaPluginExtension::class).apply {
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-  }
-
-  project.kotlinCommonSettings(this, "commonMainImplementation")
-}
+project.kotlinCommonSettings(bomConfigurationName = "commonMainImplementation")