From b2e56dfe072bd7e5d05e7530c1ca18238aae7038 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 7 Apr 2022 14:15:44 +0200 Subject: [PATCH] simplify gradle --- gradle/test_dependencies.gradle | 4 +--- wear/build.gradle | 20 +------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/gradle/test_dependencies.gradle b/gradle/test_dependencies.gradle index 03a362472f..9628a048a9 100644 --- a/gradle/test_dependencies.gradle +++ b/gradle/test_dependencies.gradle @@ -4,9 +4,7 @@ dependencies { testImplementation "org.mockito:mockito-core:$mockito_version" testImplementation "org.mockito:mockito-inline:$mockito_version" testImplementation "joda-time:joda-time:$jodatime_version" - testImplementation('com.google.truth:truth:1.1.3') { - exclude group: "com.google.guava", module: "guava" - } + testImplementation "com.google.truth:truth:1.1.3" testImplementation "org.skyscreamer:jsonassert:1.5.0" testImplementation "org.hamcrest:hamcrest-all:1.3" diff --git a/wear/build.gradle b/wear/build.gradle index 3af4c3aa41..c18fc1be46 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -16,6 +16,7 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' +apply from: "${project.rootDir}/gradle/test_dependencies.gradle" apply from: "${project.rootDir}/gradle/android_dependencies.gradle" apply from: "${project.rootDir}/gradle/jacoco_global.gradle" @@ -117,25 +118,6 @@ dependencies { implementation "androidx.wear.tiles:tiles:1.0.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - testImplementation "junit:junit:$junit_version" - testImplementation "org.json:json:$json_version" - testImplementation("org.mockito:mockito-core:${mockito_version}") { - exclude group: 'net.bytebuddy', module: 'byte-buddy' - exclude group: 'net.bytebuddy', module: 'byte-buddy-android' - exclude group: 'net.bytebuddy', module: 'byte-buddy-agent' - } - // to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+ - testImplementation "net.bytebuddy:byte-buddy:$byteBuddy_version" - testImplementation "net.bytebuddy:byte-buddy-android:$byteBuddy_version" - testImplementation "net.bytebuddy:byte-buddy-agent:$byteBuddy_version" - - testImplementation "joda-time:joda-time:$jodatime_version" - testImplementation('com.google.truth:truth:1.1.3') { - exclude group: "com.google.guava", module: "guava" - } - testImplementation "org.skyscreamer:jsonassert:1.5.0" - testImplementation "org.hamcrest:hamcrest-all:1.3" - // for old fashioned support-app version implementation "com.google.dagger:dagger:$dagger_version" implementation "com.google.dagger:dagger-android:$dagger_version"