Merge branch 'main' into kl/add_loading_state

slackhq · Oct 14, 2024 · a2bb67e · a2bb67e
2 parents 49824e7 + dd8cdb3
commit a2bb67e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,18 @@ Changelog
 **Unreleased**
 --------------
 
+0.20.1
+------
+
+_2024-10-14_
+
+- **Fix**: Fall back to old property name for kotlin JVM args if the new one isn't found.
+- **Enhancement**: Don't try to apply kotlin JVM args if there are none.
+
 0.20.0
 ------
 
-_2024-09-25_
+_2024-10-11_
 
 ### Project Restructuring
 

diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/FoundryProperties.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/FoundryProperties.kt
@@ -386,17 +386,21 @@ internal constructor(
     get() = optionalStringProperty("foundry.android.disabledVariants")
 
   /**
-   * The Slack-specific kotlin.daemon.jvmargs computed by bootstrap.
+   * The project-specific kotlin.daemon.jvmargs computed by bootstrap.
    *
    * We don't just blanket use `kotlin.daemon.jvmargs` alone because we don't want to pollute other
    * projects.
    */
-  public val kotlinDaemonArgs: String
+  public val kotlinDaemonArgs: List<String>?
     get() =
-      stringProperty(
-        KOTLIN_DAEMON_ARGS_KEY,
-        defaultValue = stringProperty(KOTLIN_DAEMON_ARGS_KEY_OLD, defaultValue = ""),
-      )
+      optionalStringProperty(
+          KOTLIN_DAEMON_ARGS_KEY,
+          defaultValue = optionalStringProperty(KOTLIN_DAEMON_ARGS_KEY_OLD, defaultValue = null),
+        )
+        ?.split(" ")
+        ?.map(String::trim)
+        ?.filterNot(String::isBlank)
+        ?.takeUnless(List<*>::isNotEmpty)
 
   /**
    * Flag to enable ciUnitTest on this project. Default is true.
@@ -658,7 +662,7 @@ internal constructor(
     get() = resolver.booleanValue("foundry.artifacts.configure-eagerly", defaultValue = false)
 
   /**
-   * Force-disables Anvil regardless of `SlackExtension.dagger()` settings, useful for K2 testing
+   * Force-disables Anvil regardless of `FoundryExtension.dagger()` settings, useful for K2 testing
    * where Anvil is unsupported.
    */
   public val disableAnvilForK2Testing: Boolean
@@ -778,7 +782,7 @@ internal constructor(
 
   public companion object {
     /**
-     * The Slack-specific kotlin.daemon.jvmargs computed by bootstrap.
+     * The project-specific kotlin.daemon.jvmargs computed by bootstrap.
      *
      * We don't just blanket use `kotlin.daemon.jvmargs` alone because we don't want to pollute
      * other projects.

diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/GlobalConfig.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/GlobalConfig.kt
@@ -21,7 +21,7 @@ import org.gradle.jvm.toolchain.JvmVendorSpec
 /** Registry of global configuration info. */
 public class GlobalConfig
 private constructor(
-  internal val kotlinDaemonArgs: List<String>,
+  internal val kotlinDaemonArgs: List<String>?,
   internal val errorProneCheckNamesAsErrors: List<String>,
   internal val affectedProjects: Set<String>?,
   internal val jvmVendor: JvmVendorSpec?,
@@ -32,7 +32,7 @@ private constructor(
       check(project == project.rootProject) { "Project is not root project!" }
       val globalFoundryProperties = FoundryProperties(project)
       return GlobalConfig(
-        kotlinDaemonArgs = globalFoundryProperties.kotlinDaemonArgs.split(" "),
+        kotlinDaemonArgs = globalFoundryProperties.kotlinDaemonArgs,
         errorProneCheckNamesAsErrors =
           globalFoundryProperties.errorProneCheckNamesAsErrors?.split(":").orEmpty(),
         affectedProjects =

diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/kgp/KgpTasks.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/kgp/KgpTasks.kt
@@ -68,7 +68,7 @@ internal object KgpTasks {
     project.pluginManager.onFirst(KGP_PLUGINS) {
       val kotlinExtension = project.kotlinExtension
       kotlinExtension.apply {
-        kotlinDaemonJvmArgs = foundryTools.globalConfig.kotlinDaemonArgs
+        foundryTools.globalConfig.kotlinDaemonArgs?.let { kotlinDaemonJvmArgs = it }
         foundryProperties.versions.jdk.ifPresent { jdkVersion ->
           jvmToolchain {
             languageVersion.set(JavaLanguageVersion.of(jdkVersion))