From 54c4b01411b74b9a6d84e286f828e897b1d50001 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 5 Oct 2022 00:08:50 +0530 Subject: [PATCH] chore(deps): upgrade to Compose Compiler 1.3.2 --- .../kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt | 2 -- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 5 +---- 3 files changed, 2 insertions(+), 7 deletions(-) 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 a917525d..32bf3dc3 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 @@ -44,8 +44,6 @@ 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 f90250af..785643cf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ accompanist = "0.26.4-beta" agp = "8.0.0-alpha02" coil = "2.2.2" -composeCompiler = "1.4.0-dev-k1.7.20-RC-a143c065804" +composeCompiler = "1.3.2" coroutines = "1.6.4" dagger = "2.44" hilt = "1.0.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 18bf5c32..a932210c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -45,10 +45,6 @@ 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 { @@ -61,6 +57,7 @@ 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")