From 0b852ae4a842a3ecabe0bbbb04d49dba085cc549 Mon Sep 17 00:00:00 2001 From: Mohsen Rzna Date: Fri, 5 Apr 2024 00:25:45 +0200 Subject: [PATCH] Using stable AGP --- app/build.gradle.kts | 1 - gradle/libs.versions.toml | 5 +---- reusablecomponents/build.gradle.kts | 14 -------------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1df19ec..975644d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -79,7 +79,6 @@ dependencies { detektPlugins(libs.detekt.formatting) - testImplementation(libs.junit) debugImplementation(libs.androidx.ui.test.manifest) debugImplementation(libs.androidx.ui.tooling) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4bc439a..8501592 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,7 @@ [versions] -agp = "8.4.0-beta02" +agp = "8.3.1" kotlin = "1.9.23" coreKtx = "1.12.0" -junit = "4.13.2" lifecycleRuntimeKtx = "2.7.0" activityCompose = "1.8.2" composeBom = "2024.04.00" @@ -12,7 +11,6 @@ mavenPublish = "0.28.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } @@ -23,7 +21,6 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material-3" } - detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } [plugins] diff --git a/reusablecomponents/build.gradle.kts b/reusablecomponents/build.gradle.kts index bb32ba3..9105bdd 100644 --- a/reusablecomponents/build.gradle.kts +++ b/reusablecomponents/build.gradle.kts @@ -3,7 +3,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary plugins { alias(libs.plugins.android.library) alias(libs.plugins.jetbrains.kotlin.android) - alias(libs.plugins.detekt) id(libs.plugins.mavenPublish.get().pluginId) } @@ -13,9 +12,6 @@ android { defaultConfig { minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") } buildTypes { @@ -51,13 +47,6 @@ android { composeOptions { kotlinCompilerExtensionVersion = "1.5.11" } - - detekt { - config.setFrom(file("$rootDir/app/config/detekt/config.yml")) - parallel = true - buildUponDefaultConfig = true - autoCorrect = true - } } dependencies { @@ -71,9 +60,6 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material.iconsExtended) - detektPlugins(libs.detekt.formatting) - - testImplementation(libs.junit) debugImplementation(libs.androidx.ui.test.manifest) debugImplementation(libs.androidx.ui.tooling) }