From 92123d2f2488cfc735c9e8d2c8a60175123f666b Mon Sep 17 00:00:00 2001 From: William Brawner Date: Sat, 18 May 2024 22:30:55 -0600 Subject: [PATCH] Address buildHealth issues --- app/build.gradle.kts | 45 +++++++++++++++++++++++---------------- core/build.gradle.kts | 12 +++-------- free/build.gradle.kts | 16 -------------- non-free/build.gradle.kts | 17 +++++---------- 4 files changed, 35 insertions(+), 55 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1acc3a1..aad2da0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,7 +5,6 @@ import java.util.Properties plugins { id("com.android.application") id("kotlin-android") - id("kotlin-kapt") id("com.osacky.fladle") id("com.github.triplet.play") version "3.8.4" id("com.wbrawner.releasehelper") @@ -114,27 +113,18 @@ dependencies { "playImplementation"(project(":non-free")) implementation("androidx.compose.material3:material3-window-size-class-android:1.2.0") val navigationVersion = "2.7.2" - implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion") - implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion") implementation("androidx.navigation:navigation-compose:$navigationVersion") testImplementation("junit:junit:4.13.2") - testImplementation("org.robolectric:robolectric:4.2.1") + testRuntimeOnly("org.robolectric:robolectric:4.2.1") val espressoVersion = "3.5.1" androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion") androidTestImplementation("androidx.test.espresso:espresso-web:$espressoVersion") androidTestImplementation("androidx.test.espresso:espresso-intents:$espressoVersion") - androidTestImplementation("androidx.test:runner:1.5.2") - androidTestImplementation("androidx.test:rules:1.5.0") + androidTestRuntimeOnly("androidx.test:runner:1.5.2") androidTestUtil("androidx.test:orchestrator:1.4.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0") implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.preference:preference-ktx:1.2.1") - implementation("androidx.fragment:fragment-ktx:1.6.1") - implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("com.google.android.material:material:1.9.0") - implementation("androidx.legacy:legacy-support-v13:1.0.0") implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.browser:browser:1.6.0") val commonMarkVersion = "0.22.0" @@ -154,19 +144,38 @@ dependencies { implementation("androidx.activity:activity-compose") implementation("androidx.compose.foundation:foundation") implementation("androidx.compose.foundation:foundation-layout") - implementation("androidx.compose.material:material") - implementation("androidx.compose.runtime:runtime-livedata") implementation("androidx.compose.ui:ui-tooling") implementation("androidx.compose.material3:material3") implementation("androidx.compose.material:material-icons-extended") androidTestImplementation("androidx.compose.ui:ui-test-junit4") val coroutinesVersion = "1.7.1" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") + runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion") - val lifecycleVersion = "2.2.0" - implementation("androidx.lifecycle:lifecycle-extensions:$lifecycleVersion") - kapt("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") implementation("eu.crydee:syllable-counter:4.0.2") + androidTestImplementation("androidx.compose.ui:ui-test:1.6.0") + androidTestImplementation("androidx.test:core:1.5.0") + androidTestImplementation("androidx.test:monitor:1.6.1") + androidTestImplementation("junit:junit:4.13.2") + androidTestImplementation("org.hamcrest:hamcrest-core:1.3") + implementation("androidx.activity:activity-ktx:1.8.0") + implementation("androidx.activity:activity:1.8.0") + implementation("androidx.compose.animation:animation-core:1.6.0") + implementation("androidx.compose.animation:animation:1.6.0") + implementation("androidx.compose.material:material-icons-core:1.6.0") + implementation("androidx.compose.ui:ui-graphics:1.6.0") + implementation("androidx.compose.ui:ui-text:1.6.0") + implementation("androidx.compose.ui:ui-tooling-preview:1.6.0") + implementation("androidx.compose.ui:ui-unit:1.6.0") + implementation("androidx.core:core:1.13.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.2") + implementation("androidx.navigation:navigation-common:2.7.2") + implementation("androidx.navigation:navigation-runtime:2.7.2") + implementation("androidx.preference:preference:1.2.1") + implementation("ch.acra:acra-core:5.11.3") + implementation("com.jakewharton.timber:timber:5.0.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") + implementation(project(":core")) } fladle { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index fd8033f..de24d2e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -52,15 +52,9 @@ android { dependencies { val acraVersion = "5.11.3" - api("ch.acra:acra-core:$acraVersion") + implementation("ch.acra:acra-core:$acraVersion") implementation("ch.acra:acra-http:$acraVersion") - implementation("ch.acra:acra-limiter:$acraVersion") - implementation("ch.acra:acra-advanced-scheduler:$acraVersion") + runtimeOnly("ch.acra:acra-limiter:$acraVersion") + runtimeOnly("ch.acra:acra-advanced-scheduler:$acraVersion") api("com.jakewharton.timber:timber:5.0.1") - implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.12.0") - testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") } \ No newline at end of file diff --git a/free/build.gradle.kts b/free/build.gradle.kts index 561fac2..a934bb6 100644 --- a/free/build.gradle.kts +++ b/free/build.gradle.kts @@ -39,25 +39,9 @@ android { } dependencies { - api(project(":core")) - implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.12.0") implementation("com.jakewharton.timber:timber:5.0.1") val composeBom = platform("androidx.compose:compose-bom:2023.08.00") implementation(composeBom) androidTestImplementation(composeBom) implementation("androidx.compose.runtime:runtime") - implementation("androidx.compose.ui:ui") - implementation("androidx.activity:activity-compose") - implementation("androidx.compose.foundation:foundation") - implementation("androidx.compose.foundation:foundation-layout") - implementation("androidx.compose.material:material") - implementation("androidx.compose.runtime:runtime-livedata") - implementation("androidx.compose.ui:ui-tooling") - implementation("androidx.compose.material3:material3") - implementation("androidx.compose.material:material-icons-extended") - testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") } \ No newline at end of file diff --git a/non-free/build.gradle.kts b/non-free/build.gradle.kts index 06764c3..c7c2a01 100644 --- a/non-free/build.gradle.kts +++ b/non-free/build.gradle.kts @@ -39,27 +39,20 @@ android { } dependencies { - api(project(":core")) implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.preference:preference-ktx:1.2.1") implementation("com.android.billingclient:billing:6.0.1") - implementation("com.google.android.play:core-ktx:1.8.1") - implementation("com.jakewharton.timber:timber:5.0.1") + api("com.jakewharton.timber:timber:5.0.1") val composeBom = platform("androidx.compose:compose-bom:2023.08.00") implementation(composeBom) androidTestImplementation(composeBom) implementation("androidx.compose.runtime:runtime") implementation("androidx.compose.ui:ui") - implementation("androidx.activity:activity-compose") implementation("androidx.compose.foundation:foundation") implementation("androidx.compose.foundation:foundation-layout") - implementation("androidx.compose.material:material") - implementation("androidx.compose.runtime:runtime-livedata") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-text") + implementation("androidx.preference:preference-ktx:1.2.1") + implementation("com.google.android.play:core:1.10.3") implementation("androidx.compose.ui:ui-tooling") implementation("androidx.compose.material3:material3") - implementation("androidx.compose.material:material-icons-extended") - testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") } \ No newline at end of file