Update sgp to v0.19.6 (#1672)

This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.slack.gradle.root](https://redirect.github.com/slackhq/slack-gradle-plugin) | `0.19.1` -> `0.19.6` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.slack.gradle.root/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.slack.gradle.root/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.slack.gradle.root/0.19.1/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.slack.gradle.root/0.19.1/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.slack.gradle.base](https://redirect.github.com/slackhq/slack-gradle-plugin) | `0.19.1` -> `0.19.6` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.slack.gradle.base/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.slack.gradle.base/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.slack.gradle.base/0.19.1/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.slack.gradle.base/0.19.1/0.19.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>slackhq/slack-gradle-plugin (com.slack.gradle.root)</summary> ### [`v0.19.6`](https://redirect.github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#0196) [Compare Source](https://redirect.github.com/slackhq/slack-gradle-plugin/compare/0.19.5...0.19.6) *2024-09-25* - Intro `SoftRefLRUPolicyMSPerMB` + `ReservedCodeCacheSize` jvm args to bootstrap - Learnings from https://jasonpearson.dev/codecache-in-jvm-builds and https://jasonpearson.dev/softreflrupolicymspermb-in-jvm-builds. - Update kotlin-cli-util to `3.0.1`. - Update to Guava `33.3.1-jre`. - Build against Gradle `8.10.2`. ### [`v0.19.5`](https://redirect.github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#0195) [Compare Source](https://redirect.github.com/slackhq/slack-gradle-plugin/compare/0.19.4...0.19.5) *2024-09-23* - Add workaround for KGP not applying `sourceInformation` compose options in android projects and default it to true. ### [`v0.19.4`](https://redirect.github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#0194) [Compare Source](https://redirect.github.com/slackhq/slack-gradle-plugin/compare/0.19.3...0.19.4) *2024-09-22* - Change `slack.allowWarnings` property to `sgp.kotlin.allowWarnings`. - Disallow warnings in Kotlin test compilations by default, add `sgp.kotlin.allowWarningsInTests` property to opt-out. - Update to kotlinx-coroutines `1.9.0`. - Update Okio to `3.9.1`. - Update to Clikt `5.0.0`. - Update JNA to `5.15.0`. - Update oshi-core to `6.6.4`. - Update kotlin-cli-util to `3.0.0`. - Build against AGP `8.6.1`. ### [`v0.19.3`](https://redirect.github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#0193) [Compare Source](https://redirect.github.com/slackhq/slack-gradle-plugin/compare/0.19.2...0.19.3) *2024-09-12* - **Change**: Rename `testFixtures()` feature DSL to `enableTestFixtures()` to disambiguate from Gradle's methods. - **New**: Introduce new `sgp.compose.stabilityConfigurationPath` property to specify a Compose configuration file path from the root project. It is also now disallowed to specify this via `sgp.compose.commonCompilerOptions`. ### [`v0.19.2`](https://redirect.github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#0192) [Compare Source](https://redirect.github.com/slackhq/slack-gradle-plugin/compare/0.19.1...0.19.2) *2024-09-12* - \[sgp] **New**: Add new `slack { features { testFixtures() } }` DSL for enabling test fixtures in a project-agnostic way. - \[sgp] Make `slack.location.robolectric-core` property optional. - \[sgp] Clean up duplicate Kotlin JVM argument handling in `KaptGenerateStubsTask`. - \[sgp] Update to the new compose-compiler-gradle-plugin feature flag API. - \[sgp] Apply platform project BOMs to SqlDelight `DialectClasspath` configurations too. - \[sgp] Build against KSP `2.0.20-1.0.25`. - \[sgp] Build against AGP `8.6.0`. - \[sgp] Build against Gradle `8.10.1`. - \[sgp] Build against Wire `5.1.0`. - \[skippy] Don't treat testFixtures as test sources </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/ZacSweers/CatchUp).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers <[email protected]>
ZacSweers · Oct 8, 2024 · 04bd356 · 04bd356
1 parent 114ec0b
commit 04bd356
Show file tree

Hide file tree

Showing 43 changed files with 128 additions and 112 deletions.
diff --git a/app-scaffold/build.gradle.kts b/app-scaffold/build.gradle.kts
@@ -16,14 +16,14 @@
 import com.google.devtools.ksp.gradle.KspAATask
 import com.google.devtools.ksp.gradle.KspTaskJvm
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import slack.gradle.SlackProperties
+import foundry.gradle.FoundryProperties
 
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.kapt) apply false
   alias(libs.plugins.kotlin.parcelize)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.apollo)
   alias(libs.plugins.anvil)
   alias(libs.plugins.ksp)
@@ -33,7 +33,7 @@ plugins {
 
 kotlin { compilerOptions { optIn.add("androidx.compose.material3.ExperimentalMaterial3Api") } }
 
-slack {
+foundry {
   @Suppress("OPT_IN_USAGE")
   features {
     compose {
@@ -93,7 +93,7 @@ apollo {
   }
 }
 
-val anvilMode = SlackProperties(project).anvilMode
+val anvilMode = FoundryProperties(project).anvilMode
 
 if (!anvilMode.useDaggerKsp) {
   apply(plugin = libs.plugins.kotlin.kapt.get().pluginId)

diff --git a/app-scaffold/gradle.properties b/app-scaffold/gradle.properties
@@ -1,2 +1,5 @@
-slack.gradle.config.libraryWithVariants=true
-slack.ci-unit-test.variant=debug
+foundry.android.libraryWithVariants=true
+foundry.ci-unit-test.variant=debug
+# TODO remove in AGP 8.8 after it's fixed
+#  https://issuetracker.google.com/issues/372062075
+foundry.compose.useIncludeInformationWorkaround=false
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -29,7 +29,7 @@ import okio.source
 plugins {
   alias(libs.plugins.android.application)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.licensee)
   alias(libs.plugins.bugsnag)
   alias(libs.plugins.baselineprofile)

diff --git a/app/gradle.properties b/app/gradle.properties
@@ -1,3 +1,3 @@
-slack.ci-unit-test.enable=false
-slack.gradle.config.bugsnag.enabledBranchPattern=(main|release_.*)
-slack.gradle.config.bugsnag.enabled=true
+foundry.ci-unit-test.enable=false
+foundry.android.bugsnag.enabledBranchPattern=(main|release_.*)
+foundry.android.bugsnag.enabled=true
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -1,12 +1,12 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
 import com.android.build.api.dsl.ManagedVirtualDevice
-import slack.gradle.isCi
+import foundry.gradle.isCi
 
 plugins {
   alias(libs.plugins.android.test)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.baselineprofile)
 }
 

diff --git a/benchmark/gradle.properties b/benchmark/gradle.properties
@@ -1,6 +1,6 @@
-slack.ci-unit-test.enable=false
-slack.ci-lint.enable=false
+foundry.ci-unit-test.enable=false
+foundry.ci-lint.enable=false
 
 # Not supported yet in DAGP
 # https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/issues/797
-slack.gradle.config.enableAnalysisPlugin=false
+foundry.enableAnalysisPlugin=false
diff --git a/bookmarks/build.gradle.kts b/bookmarks/build.gradle.kts
@@ -16,7 +16,7 @@
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.android.library)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.anvil)
 }
 
@@ -54,7 +54,7 @@ kotlin {
 
 android { namespace = "catchup.bookmarks" }
 
-slack {
+foundry {
   features {
     dagger()
   }

diff --git a/bookmarks/db/build.gradle.kts b/bookmarks/db/build.gradle.kts
@@ -16,7 +16,7 @@
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.android.library)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.sqldelight)
 }
 
@@ -41,7 +41,7 @@ kotlin {
 
 android { namespace = "catchup.bookmarks.db" }
 
-slack {
+foundry {
   features {
     dagger()
   }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,8 +22,8 @@ plugins {
   alias(libs.plugins.android.application) apply false
   alias(libs.plugins.android.library) apply false
   alias(libs.plugins.android.test) apply false
-  alias(libs.plugins.sgp.root)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.root)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.spotless) apply false
   alias(libs.plugins.doctor) apply false
   alias(libs.plugins.ksp) apply false

diff --git a/config/lint/lint.xml b/config/lint/lint.xml
@@ -38,6 +38,9 @@
   <!-- Something is up with EnsureInitializerMetadata -->
   <issue id="UnknownIssueId" severity="ignore" />
 
+  <!-- Too noisy and only really from slack -->
+  <issue id="AvoidUsingNotNullOperator" severity="ignore" />
+
   <!-- Slack-specific -->
   <issue id="RawDispatchersUse,DeprecatedCall,MoshiUsageEnumMissingUnknown,MainScopeUsage" severity="ignore" />
 </lint>
diff --git a/gradle.properties b/gradle.properties
@@ -22,6 +22,7 @@ org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 
 # Kapt controls
 kapt.include.compile.classpath=false
+
 # Enable when it works
 kapt.use.k2=false
 
@@ -77,25 +78,26 @@ android.library.defaults.buildfeatures.androidresources=false
 # Gradle's auto-provisioning of JDKs doesn't properly support Apple Silicon
 org.gradle.java.installations.auto-download=false
 
-slack.robolectricTestSdks=28,29,30,31,32,33
-slack.robolectricIVersion=4
-slack.compileSdkVersion=android-35
-slack.minSdkVersion=29
-slack.targetSdkVersion=35
-slack.latestCompileSdkWithSources=35
-slack.location.slack-platform=:platform
+foundry.android.defaultNamespacePrefix=catchup
+foundry.android.robolectric.testSdks=28,29,30,31,32,33
+foundry.android.robolectric.iVersion=4
+foundry.android.compileSdkVersion=android-35
+foundry.android.minSdkVersion=29
+foundry.android.targetSdkVersion=35
+foundry.android.latestCompileSdkWithSources=35
+foundry.location.foundry-platform=:platform
 
 # Dependency sorter doesn't really work on KMP projects
-slack.sortDependencies.ignore=:service-api,:bookmarks
+foundry.sortDependencies.ignore=:service-api,:bookmarks
 
-#slack.detekt.configs=config/detekt/detekt.yml
+#foundry.detekt.configs=config/detekt/detekt.yml
 slack.detekt.baseline=config/detekt/baseline.xml
 
-slack.allow-ksp=true
-slack.allow-moshi-ir=true
-slack.auto-apply.detekt=false
-slack.log-thermals=true
-slack.lint.baseline-file-name=lint-baseline.xml
+foundry.ksp.enable=true
+foundry.moshi.ir.enable=true
+foundry.auto-apply.detekt=false
+foundry.logging.thermals=true
+foundry.lint.baseline-file-name=lint-baseline.xml
 
 # K1_KSP_ONLY               - KSP1  - yes
 # K2_KSP_ONLY               - KSP1  - yes
@@ -104,24 +106,24 @@ slack.lint.baseline-file-name=lint-baseline.xml
 # K2_KSP_KAPT   - KAPT K2   - KSP1  - no
 # K2_KSP_KAPT   - KAPT K1   - KSP1  - yes
 # K2_KSP_KAPT   - KAPT K1   - KSP2  - yes
-sgp.anvil.mode=K2_KSP_KAPT
+foundry.anvil.mode=K2_KSP_KAPT
 
 # Use the anvil-ksp fork
-sgp.anvil.useKspFork=true
+foundry.anvil.useKspFork=true
 
 com.squareup.anvil.kspContributingAnnotations=com.slack.circuit.codegen.annotations.CircuitInject
 
 # Temporary due to K2 KAPT emitting a warning
 slack.allowWarnings=true
 
-sgp.beta=true
+foundry.beta=true
 
 # Use Zulu for auto-configured JDK downloads.
-sgp.config.jvmVendor=AZUL
+foundry.jvm.vendor=AZUL
 
-sgp.compose.commonCompilerOptions=strongSkipping=true
+foundry.compose.commonCompilerOptions=sourceInformation=true
 
-sgp.kotlin.optIns=\
+foundry.kotlin.optIns=\
   kotlin.ExperimentalStdlibApi,\
   kotlin.contracts.ExperimentalContracts,\
   kotlin.experimental.ExperimentalTypeInference,\
@@ -134,7 +136,7 @@ sgp.kotlin.optIns=\
 # -Xself-upper-bound-inference
 #   Support inferring type arguments based on only self upper bounds of the corresponding
 #   type parameters
-sgp.kotlin.freeArgs=\
+foundry.kotlin.freeArgs=\
   -Xenhance-type-parameter-types-to-def-not-null,\
   -Xself-upper-bound-inference
 
@@ -150,14 +152,17 @@ sgp.kotlin.freeArgs=\
 #   Enable new jvm-default behavior
 #   https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-m3-generating-default-methods-in-interfaces/
 # -Xtype-enhancement-improvements-strict-mode
-sgp.kotlin.jvmFreeArgs=\
+foundry.kotlin.jvmFreeArgs=\
   -Xassertions=jvm,\
   -Xemit-jvm-type-annotations,\
   -Xjspecify-annotations=strict,\
   -Xjsr305=strict,\
   -Xjvm-default=all,\
   -Xtype-enhancement-improvements-strict-mode
 
+foundry.kotlin.progressive=true
+foundry.kapt.languageVersion=1.9
+
 # Disable noisy logging about mismatched KSP and Kotlin versions
 ksp.version.check=false
 
@@ -174,11 +179,11 @@ android.disableResourceValidation=true
 # Disable DAGP's noisy warning about supported versions
 dependency.analysis.compatibility=NONE
 
-# SGP: https://github.com/slackhq/slack-gradle-plugin
-#systemProp.slack.include-build.sgp=/path/to/slack-gradle-plugin
+# Foundry: https://github.com/slackhq/foundry
+#systemProp.catchup.include-build.foundry=/path/to/foundry
 
 # DAGP: https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
-#systemProp.slack.include-build.dagp=/path/to/dependency-analysis-gradle-plugin
+#systemProp.catchup.include-build.dagp=/path/to/dependency-analysis-gradle-plugin
 
 # Anvil: https://github.com/square/anvil
-#systemProp.slack.include-build.anvil=/path/to/anvil
+#systemProp.catchup.include-build.anvil=/path/to/anvil
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ preferences = "1.2.1"
 retrofit = "2.11.0"
 slack-lint = "0.8.1"
 sortDependencies = "0.8"
-sgp = "0.19.1"
+foundry = "0.20.0-alpha03"
 spotless = "7.0.0.BETA2"
 sqldelight = "2.0.2"
 telephoto = "0.13.0"
@@ -72,8 +72,8 @@ moshix = { id = "dev.zacsweers.moshix", version.ref = "moshix" }
 playPublisher = { id = "com.github.triplet.play", version = "3.11.0" }
 redacted = { id = "dev.zacsweers.redacted", version = "1.10.0" }
 retry = { id = "org.gradle.test-retry", version = "1.6.0" }
-sgp-base = { id = "com.slack.gradle.base", version.ref = "sgp" }
-sgp-root = { id = "com.slack.gradle.root", version.ref = "sgp" }
+foundry-base = { id = "com.slack.foundry.base", version.ref = "foundry" }
+foundry-root = { id = "com.slack.foundry.root", version.ref = "foundry" }
 sortDependencies = { id = "com.squareup.sort-dependencies", version.ref = "sortDependencies" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }

diff --git a/libraries/appconfig/build.gradle.kts b/libraries/appconfig/build.gradle.kts
@@ -16,7 +16,7 @@
 
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
 }
 
 kotlin {

diff --git a/libraries/auth/build.gradle.kts b/libraries/auth/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.moshix)
 }
 

diff --git a/libraries/base-ui/build.gradle.kts b/libraries/base-ui/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
 }
@@ -24,7 +24,7 @@ android {
   namespace = "catchup.ui.core"
 }
 
-slack {
+foundry {
   features {
     compose()
     dagger()

diff --git a/libraries/compose-extensions/build.gradle.kts b/libraries/compose-extensions/build.gradle.kts
@@ -17,12 +17,12 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
 }
 
 android { namespace = "catchup.compose" }
 
-slack { features { compose() } }
+foundry { features { compose() } }
 
 dependencies {
   api(libs.androidx.compose.accompanist.systemUi)

diff --git a/libraries/deeplinking/build.gradle.kts b/libraries/deeplinking/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
 }
 
-slack {
+foundry {
   features {
     dagger()
   }

diff --git a/libraries/di/android/build.gradle.kts b/libraries/di/android/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
 }
 
-slack {
+foundry {
   features {
     daggerRuntimeOnly()
   }

diff --git a/libraries/di/build.gradle.kts b/libraries/di/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
 }
 
 kotlin {

diff --git a/libraries/flowbinding/build.gradle.kts b/libraries/flowbinding/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
 }
 
 android {

diff --git a/libraries/gemoji/build.gradle.kts b/libraries/gemoji/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  alias(libs.plugins.sgp.base)
+  alias(libs.plugins.foundry.base)
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
 }
@@ -24,7 +24,7 @@ android {
   namespace = "catchup.gemoji"
 }
 
-slack {
+foundry {
   features {
     dagger()
   }