From 67ceb865186a2ccc75e53488ab1ad1b5c1ec60c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:16:25 +0000 Subject: [PATCH 1/2] Update kotlin monorepo to v1.9.22 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b77806860d..2b3008cd902 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ 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" From f38b314ebee8ab359a963067bebad20ca5c226c9 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 28 Feb 2024 10:46:24 -0500 Subject: [PATCH 2/2] Use Supress hammer to restore compilation Also update Compose compiler to a 1.9.22-compatible version. --- build.gradle.kts | 9 +++++++++ gradle/libs.versions.toml | 3 ++- .../app/cash/paging/CombinedLoadStates.commonAndroidX.kt | 2 ++ .../kotlin/app/cash/paging/Pager.commonAndroidX.kt | 2 ++ .../app/cash/paging/PagingConfig.commonAndroidX.kt | 2 ++ .../kotlin/app/cash/paging/PagingData.kt | 2 ++ .../kotlin/app/cash/paging/PagingDataDiffer.kt | 2 ++ .../app/cash/paging/PagingLogger.commonAndroidX.kt | 2 ++ .../app/cash/paging/PagingSource.commonAndroidX.kt | 3 +++ .../kotlin/app/cash/paging/ExperimentalPagingApi.kt | 1 + .../kotlin/app/cash/paging/CombinedLoadStates.kt | 2 ++ .../kotlin/app/cash/paging/Pager.kt | 2 ++ .../kotlin/app/cash/paging/PagingConfig.kt | 2 ++ .../kotlin/app/cash/paging/PagingData.kt | 2 ++ .../kotlin/app/cash/paging/PagingDataDiffer.kt | 2 ++ .../kotlin/app/cash/paging/PagingLogger.kt | 2 ++ .../kotlin/app/cash/paging/PagingSource.kt | 3 +++ .../kotlin/app/cash/paging/testing/TestPager.kt | 2 ++ .../kotlin/app/cash/paging/testing/TestPager.kt | 2 ++ renovate.json5 | 7 ++++++- samples/repo-search/android-composeui/build.gradle.kts | 2 +- 21 files changed, 53 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9ba624c9b93..71662133ab7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,16 +27,25 @@ allprojects { plugins.withId("org.jetbrains.kotlin.multiplatform") { configure { jvmToolchain(11) + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } } } plugins.withId("org.jetbrains.kotlin.jvm") { configure { jvmToolchain(11) + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } } } plugins.withId("org.jetbrains.kotlin.android") { configure { jvmToolchain(11) + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b3008cd902..10ea43a4c74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,6 @@ 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.22" kotlinx-coroutines = "1.7.3" @@ -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/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.commonAndroidX.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.commonAndroidX.kt index 7dae803979c..2acb49f57a7 100644 --- a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/CombinedLoadStates.commonAndroidX.kt +++ b/paging-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 index ce2c1759785..8cbe108e26e 100644 --- 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 = androidx.paging.Pager 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 index 6d577895f8d..5874240bd21 100644 --- 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 index 43f91495bd6..56ac43eeeaa 100644 --- 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 = androidx.paging.PagingData diff --git a/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt b/paging-common/src/commonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt index 110e6eb620c..37eb61586b6 100644 --- 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 = androidx.paging.PagingDataDiffer /** @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 index 164d9de0206..8ca927da736 100644 --- 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 index 816070988ff..403cd6ebb88 100644 --- 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 = androidx.paging.PagingSour // Conflicts with the other actual typealias Error so just prefixed the surrounding class actual typealias PagingSourceLoadResultError = androidx.paging.PagingSource.LoadResult.Error actual typealias PagingSourceLoadResultInvalid = androidx.paging.PagingSource.LoadResult.Invalid + +// Constructor has default argument values. +@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS") actual typealias PagingSourceLoadResultPage = androidx.paging.PagingSource.LoadResult.Page diff --git a/paging-common/src/commonMain/kotlin/app/cash/paging/ExperimentalPagingApi.kt b/paging-common/src/commonMain/kotlin/app/cash/paging/ExperimentalPagingApi.kt index 01d62376ea5..6b55d8d63ba 100644 --- 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 index 7dae803979c..2acb49f57a7 100644 --- 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 index ce2c1759785..8cbe108e26e 100644 --- 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 = androidx.paging.Pager diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingConfig.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingConfig.kt index 6d577895f8d..5874240bd21 100644 --- 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 index 43f91495bd6..56ac43eeeaa 100644 --- 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 = androidx.paging.PagingData diff --git a/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt b/paging-common/src/commonNonAndroidXMain/kotlin/app/cash/paging/PagingDataDiffer.kt index 110e6eb620c..37eb61586b6 100644 --- 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 = androidx.paging.PagingDataDiffer /** @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 index 164d9de0206..8ca927da736 100644 --- 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 index 816070988ff..403cd6ebb88 100644 --- 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 = androidx.paging.PagingSour // Conflicts with the other actual typealias Error so just prefixed the surrounding class actual typealias PagingSourceLoadResultError = androidx.paging.PagingSource.LoadResult.Error actual typealias PagingSourceLoadResultInvalid = androidx.paging.PagingSource.LoadResult.Invalid + +// Constructor has default argument values. +@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS") actual typealias PagingSourceLoadResultPage = androidx.paging.PagingSource.LoadResult.Page 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 index 821d4325411..4a2b305c67d 100644 --- 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 = androidx.paging.testing.TestPager 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 index 821d4325411..4a2b305c67d 100644 --- 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 = androidx.paging.testing.TestPager diff --git a/renovate.json5 b/renovate.json5 index 8b3b03ca838..1a4e8af240b 100644 --- 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 index 8a188d6a953..6c91383c9c9 100644 --- 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 } }