From e9ec19d28f4b791cf9ad01ab7f92c62b5a7971fd Mon Sep 17 00:00:00 2001 From: ya0211 Date: Mon, 5 Jun 2023 21:56:19 +0800 Subject: [PATCH] Remove compose.material dependency --- app/build.gradle.kts | 1 - .../main/kotlin/AndroidApplicationComposeConventionPlugin.kt | 1 - .../src/main/kotlin/AndroidApplicationConventionPlugin.kt | 1 - gradle/libs.versions.toml | 2 -- 4 files changed, 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 14a2d95..40f6281 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,4 +1,3 @@ - import com.android.build.gradle.internal.api.ApkVariantOutputImpl import java.time.Instant diff --git a/build-logic/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt index 34654a5..22c91e1 100644 --- a/build-logic/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt +++ b/build-logic/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt @@ -25,7 +25,6 @@ class AndroidApplicationComposeConventionPlugin : Plugin { } dependencies { - "implementation"(libs.findLibrary("androidx.compose.material").get()) "implementation"(libs.findLibrary("androidx.compose.material3").get()) "implementation"(libs.findLibrary("androidx.compose.ui").get()) "implementation"(libs.findLibrary("androidx.compose.ui.tooling.preview").get()) diff --git a/build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt index b0dd484..1ddef2e 100644 --- a/build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -43,7 +43,6 @@ class AndroidApplicationConventionPlugin : Plugin { sourceSets.all { languageSettings { - optIn("androidx.compose.material.ExperimentalMaterialApi") optIn("androidx.compose.material3.ExperimentalMaterial3Api") optIn("androidx.compose.ui.ExperimentalComposeUiApi") optIn("androidx.compose.animation.ExperimentalAnimationApi") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b2cc5f5..6d8153d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,6 @@ androidxActivity = "1.7.2" androidxAppCompat = "1.6.1" androidxCompose = "1.5.0-beta01" androidxComposeCompiler = "1.4.7" -androidxComposeMaterial = "1.4.3" androidxComposeMaterial3 = "1.2.0-alpha02" androidxDocumentFile = "1.0.1" androidxHiltNavigationCompose = "1.0.0" @@ -31,7 +30,6 @@ accompanist-permissions = { group = "com.google.accompanist", name = "accompanis accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } -androidx-compose-material = { group = "androidx.compose.material", name = "material" , version.ref = "androidxComposeMaterial" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxCompose" } androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" }