diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt index 9a9f657e..f7033b72 100644 --- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt +++ b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt @@ -43,6 +43,8 @@ class KotlinCommonPlugin : Plugin { private val ADDITIONAL_COMPILER_ARGS = listOf( "-opt-in=kotlin.RequiresOptIn", + "-P", + "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.7.20", ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3f5255c9..fb706b2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,18 +2,18 @@ accompanist = "0.26.4-beta" agp = "8.0.0-alpha02" coil = "2.2.1" -composeCompiler = "1.3.1" +composeCompiler = "1.4.0-dev-k1.7.20-RC-a143c065804" coroutines = "1.6.4" dagger = "2.44" hilt = "1.0.0" -kotlin = "1.7.10" +kotlin = "1.7.20" material_motion = "0.9.1" # @pin Needs to be aligned with Retrofit okhttp = "3.14.9" retrofit = "2.9.0" richtext = "0.14.1" serialization = "1.4.0-RC" -sqldelight = "2.0.0-alpha03" +sqldelight = "2.0.0-SNAPSHOT" workmanager = "2.8.0-alpha04" [libraries] diff --git a/settings.gradle.kts b/settings.gradle.kts index a932210c..efa1cc9f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,6 +37,10 @@ pluginManagement { includeModule("com.sergei-lapin.napt", "gradle") } } + exclusiveContent { + forRepository { maven("https://oss.sonatype.org/content/repositories/snapshots/") } + filter { includeGroup("app.cash.sqldelight") } + } includeBuild("build-logic") mavenCentral() } @@ -45,6 +49,10 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + exclusiveContent { + forRepository { maven(url = "https://androidx.dev/storage/compose-compiler/repository/") } + filter { includeGroup("androidx.compose.compiler") } + } exclusiveContent { forRepository { google() } filter { @@ -57,7 +65,6 @@ dependencyResolutionManagement { includeGroup("androidx.browser") includeGroup("androidx.collection") includeGroup("androidx.compose.animation") - includeGroup("androidx.compose.compiler") includeGroup("androidx.compose.foundation") includeGroup("androidx.compose.material") includeGroup("androidx.compose.material3") @@ -120,6 +127,10 @@ dependencyResolutionManagement { includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") } } + exclusiveContent { + forRepository { maven("https://oss.sonatype.org/content/repositories/snapshots/") } + filter { includeGroup("app.cash.sqldelight") } + } mavenCentral() } }