cashapp · renovate · Feb 28, 2024 · Feb 28, 2024 · Feb 28, 2024
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,16 +27,25 @@ allprojects {
   plugins.withId("org.jetbrains.kotlin.multiplatform") {
     configure<KotlinMultiplatformExtension> {
       jvmToolchain(11)
+      compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+      }
     }
   }
   plugins.withId("org.jetbrains.kotlin.jvm") {
     configure<KotlinJvmProjectExtension> {
       jvmToolchain(11)
+      compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+      }
     }
   }
   plugins.withId("org.jetbrains.kotlin.android") {
     configure<KotlinAndroidProjectExtension> {
       jvmToolchain(11)
+      compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+      }
     }
   }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,9 +2,8 @@
 android = "8.2.2"
 androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
-androidx-compose = "1.5.3"
 androidx-paging = "3.3.0-alpha02"
-kotlin = "1.9.10"
+kotlin = "1.9.22"
 kotlinx-coroutines = "1.7.3"
 kotlinx-serialization-json = "1.6.3"
 ktor = "2.3.8"
@@ -15,6 +14,8 @@ jb-compose-plugin = "1.5.12"
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
+# Specify the full coordinate for Renovate to track even though we only use the version.
+androidx-compose-compiler = "androidx.compose.compiler:compiler:1.5.10"
 androidx-compose-material = { module = "androidx.compose.material:material", version = "1.6.2" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version = "1.6.2" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.12.0" }

diff --git a/...common/src/commonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.commonAndroidX.kt b/...common/src/commonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.commonAndroidX.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias CombinedLoadStates = androidx.paging.CombinedLoadStates
diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/Pager.commonAndroidX.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/Pager.commonAndroidX.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias Pager<Key, Value> = androidx.paging.Pager<Key, Value>
diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingConfig.commonAndroidX.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingConfig.commonAndroidX.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingConfig = androidx.paging.PagingConfig
diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingData.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingData.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Companion functions have default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingData<T> = androidx.paging.PagingData<T>
diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt
@@ -17,6 +17,8 @@
 package app.cash.paging
 
 /** @suppress */
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingDataDiffer<T> = androidx.paging.PagingDataDiffer<T>
 
 /** @suppress */

diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingLogger.commonAndroidX.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingLogger.commonAndroidX.kt
@@ -16,6 +16,8 @@
 
 package app.cash.paging
 
+// Member function has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingLogger = androidx.paging.PagingLogger
 
 actual inline fun log(

diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingSource.commonAndroidX.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingSource.commonAndroidX.kt
@@ -29,4 +29,7 @@ actual typealias PagingSourceLoadResult<Key, Value> = androidx.paging.PagingSour
 // Conflicts with the other actual typealias Error so just prefixed the surrounding class
 actual typealias PagingSourceLoadResultError<Key, Value> = androidx.paging.PagingSource.LoadResult.Error<Key, Value>
 actual typealias PagingSourceLoadResultInvalid<Key, Value> = androidx.paging.PagingSource.LoadResult.Invalid<Key, Value>
+
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingSourceLoadResultPage<Key, Value> = androidx.paging.PagingSource.LoadResult.Page<Key, Value>
diff --git a/paging-common/src/commonMain/kotlin/app/cash/paging/ExperimentalPagingApi.kt b/paging-common/src/commonMain/kotlin/app/cash/paging/ExperimentalPagingApi.kt
@@ -18,4 +18,5 @@ package app.cash.paging
 
 @RequiresOptIn
 @Retention(AnnotationRetention.BINARY)
+@Suppress("EXPECT_ACTUAL_OPT_IN_ANNOTATION")
 expect annotation class ExperimentalPagingApi()
diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias CombinedLoadStates = androidx.paging.CombinedLoadStates
diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/Pager.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/Pager.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias Pager<Key, Value> = androidx.paging.Pager<Key, Value>
diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingConfig.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingConfig.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingConfig = androidx.paging.PagingConfig
diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingData.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingData.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging
 
+// Companion functions have default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingData<T> = androidx.paging.PagingData<T>
diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt
@@ -17,6 +17,8 @@
 package app.cash.paging
 
 /** @suppress */
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingDataDiffer<T> = androidx.paging.PagingDataDiffer<T>
 
 /** @suppress */

diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingLogger.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingLogger.kt
@@ -16,6 +16,8 @@
 
 package app.cash.paging
 
+// Member function has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingLogger = androidx.paging.PagingLogger
 
 actual inline fun log(

diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingSource.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingSource.kt
@@ -29,4 +29,7 @@ actual typealias PagingSourceLoadResult<Key, Value> = androidx.paging.PagingSour
 // Conflicts with the other actual typealias Error so just prefixed the surrounding class
 actual typealias PagingSourceLoadResultError<Key, Value> = androidx.paging.PagingSource.LoadResult.Error<Key, Value>
 actual typealias PagingSourceLoadResultInvalid<Key, Value> = androidx.paging.PagingSource.LoadResult.Invalid<Key, Value>
+
+// Constructor has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias PagingSourceLoadResultPage<Key, Value> = androidx.paging.PagingSource.LoadResult.Page<Key, Value>
diff --git a/paging-testing/src/commonAndroidXMain/kotlin/app/cash/paging/testing/TestPager.kt b/paging-testing/src/commonAndroidXMain/kotlin/app/cash/paging/testing/TestPager.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging.testing
 
+// Member function has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias TestPager<Key, Value> = androidx.paging.testing.TestPager<Key, Value>
diff --git a/paging-testing/src/commonNonAndroidXMain/kotlin/app/cash/paging/testing/TestPager.kt b/paging-testing/src/commonNonAndroidXMain/kotlin/app/cash/paging/testing/TestPager.kt
@@ -16,4 +16,6 @@
 
 package app.cash.paging.testing
 
+// Member function has default argument values.
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias TestPager<Key, Value> = androidx.paging.testing.TestPager<Key, Value>
diff --git a/renovate.json5 b/renovate.json5
@@ -8,6 +8,11 @@
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true,
     },
+    {
+      "matchPackagePrefixes": [
+        "androidx.compose.compiler",
+        "org.jetbrains.kotlin:kotlin",
+      ],
+    },
   ],
 }
-
diff --git a/samples/repo-search/android-composeui/build.gradle.kts b/samples/repo-search/android-composeui/build.gradle.kts
@@ -30,7 +30,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.androidx.compose.get()
+    kotlinCompilerExtensionVersion = libs.androidx.compose.compiler.get().version
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ android { @@
       }
       composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.get()
+        kotlinCompilerExtensionVersion = libs.androidx.compose.compiler.get().version
       }
     }
@@ Expand Down @@