Prep for Kotlin 2.2.20

.github/workflows/ci.yml

@@ -22,6 +22,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
     steps:
@@ -105,7 +106,7 @@ jobs:
             **/build/reports/**
 
   build-ios:
-    runs-on: macos-latest
+    runs-on: macos-15
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
@@ -130,9 +131,6 @@ jobs:
         with:
           xcode-version: '16.4'
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:

.xcode-version

@@ -1 +1 @@
-16.2
+16.4

Gemfile

@@ -2,3 +2,8 @@ source "https://rubygems.org"
 
 gem "fastlane"
 gem "fastlane-plugin-swiftformat"
+gem "abbrev"
+gem "mutex_m"
+gem "erb"
+gem "ostruct"
+gem "logger"

Gemfile.lock

@@ -5,6 +5,7 @@ GEM
       base64
       nkf
       rexml
+    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
@@ -40,6 +41,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
+    erb (5.0.2)
     excon (0.112.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
@@ -172,6 +174,7 @@ GEM
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
+    ostruct (0.6.3)
     plist (3.7.2)
     public_suffix (5.1.1)
     rake (13.3.0)
@@ -224,8 +227,13 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  abbrev
+  erb
   fastlane
   fastlane-plugin-swiftformat
+  logger
+  mutex_m
+  ostruct
 
 BUNDLED WITH
    2.5.3

backstack/api/backstack.klib.api

@@ -92,7 +92,6 @@ final class com.slack.circuit.backstack/SaveableBackStack : com.slack.circuit.ba
     }
 }
 
-final val com.slack.circuit.backstack/com_slack_circuit_backstack_CompositeProvidedValues$stableprop // com.slack.circuit.backstack/com_slack_circuit_backstack_CompositeProvidedValues$stableprop|#static{}com_slack_circuit_backstack_CompositeProvidedValues$stableprop[0]
 final val com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack$stableprop // com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack$stableprop|#static{}com_slack_circuit_backstack_SaveableBackStack$stableprop[0]
 final val com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack_Record$stableprop // com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack_Record$stableprop|#static{}com_slack_circuit_backstack_SaveableBackStack_Record$stableprop[0]
 final val com.slack.circuit.backstack/isAtRoot // com.slack.circuit.backstack/isAtRoot|@com.slack.circuit.backstack.BackStack<out|com.slack.circuit.backstack.BackStack.Record>{}isAtRoot[0]
@@ -101,7 +100,6 @@ final val com.slack.circuit.backstack/isEmpty // com.slack.circuit.backstack/isE
     final fun (com.slack.circuit.backstack/BackStack<out com.slack.circuit.backstack/BackStack.Record>).<get-isEmpty>(): kotlin/Boolean // com.slack.circuit.backstack/isEmpty.<get-isEmpty>|<get-isEmpty>@com.slack.circuit.backstack.BackStack<out|com.slack.circuit.backstack.BackStack.Record>(){}[0]
 
 final fun <#A: com.slack.circuit.backstack/BackStack.Record> com.slack.circuit.backstack/providedValuesForBackStack(com.slack.circuit.backstack/BackStack<#A>, kotlin.collections/List<com.slack.circuit.backstack/BackStackRecordLocalProvider<#A>>?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): kotlin.collections/Map<#A, com.slack.circuit.backstack/ProvidedValues> // com.slack.circuit.backstack/providedValuesForBackStack|providedValuesForBackStack(com.slack.circuit.backstack.BackStack<0:0>;kotlin.collections.List<com.slack.circuit.backstack.BackStackRecordLocalProvider<0:0>>?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<com.slack.circuit.backstack.BackStack.Record>}[0]
-final fun com.slack.circuit.backstack/com_slack_circuit_backstack_CompositeProvidedValues$stableprop_getter(): kotlin/Int // com.slack.circuit.backstack/com_slack_circuit_backstack_CompositeProvidedValues$stableprop_getter|com_slack_circuit_backstack_CompositeProvidedValues$stableprop_getter(){}[0]
 final fun com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack$stableprop_getter(): kotlin/Int // com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack$stableprop_getter|com_slack_circuit_backstack_SaveableBackStack$stableprop_getter(){}[0]
 final fun com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack_Record$stableprop_getter(): kotlin/Int // com.slack.circuit.backstack/com_slack_circuit_backstack_SaveableBackStack_Record$stableprop_getter|com_slack_circuit_backstack_SaveableBackStack_Record$stableprop_getter(){}[0]
 final fun com.slack.circuit.backstack/rememberSaveableBackStack(com.slack.circuit.runtime.screen/Screen, kotlin/Function1<com.slack.circuit.backstack/SaveableBackStack, kotlin/Unit>?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): com.slack.circuit.backstack/SaveableBackStack // com.slack.circuit.backstack/rememberSaveableBackStack|rememberSaveableBackStack(com.slack.circuit.runtime.screen.Screen;kotlin.Function1<com.slack.circuit.backstack.SaveableBackStack,kotlin.Unit>?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]

circuit-codegen-annotations/build.gradle.kts

@@ -44,10 +44,6 @@ kotlin {
   @OptIn(ExperimentalKotlinGradlePluginApi::class)
   applyDefaultHierarchyTemplate {
     common {
-      group("commonJs") {
-        withJs()
-        withWasmJs()
-      }
       group("commonJvm") {
         withJvm()
         withAndroidTarget()
@@ -69,7 +65,7 @@ kotlin {
         api(libs.kotlinInject.anvil.runtime)
       }
     }
-    named("commonJsMain") {
+    webMain {
       dependencies {
         compileOnly(libs.kotlinInject.anvil.runtime)
         api(libs.kotlinInject.anvil.runtime)