diff --git a/app/build.gradle b/app/build.gradle index c5fee5f48c..a9e7875666 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,14 +22,6 @@ jacoco { toolVersion = "0.8.3" } -ext { - powermockVersion = "1.7.3" - dexmakerVersion = "1.2" - retrofit2Version = '2.9.0' - okhttp3Version = '4.9.0' -} - - repositories { jcenter { url "https://jcenter.bintray.com/" } mavenCentral() @@ -230,11 +222,9 @@ android { allprojects { repositories { - jcenter() flatDir { dirs 'libs' } - maven { url 'https://jitpack.io' } } } @@ -250,63 +240,6 @@ dependencies { implementation project(':omnipod') implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.google.android.gms:play-services-wearable:17.0.0' - implementation 'com.google.android.gms:play-services-location:17.1.0' - implementation platform('com.google.firebase:firebase-bom:25.12.0') - implementation "com.google.firebase:firebase-analytics-ktx" - implementation 'com.google.firebase:firebase-auth-ktx' - implementation 'com.google.firebase:firebase-database-ktx' - - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.biometric:biometric:1.0.1' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.percentlayout:percentlayout:1.0.0' - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - implementation "androidx.fragment:fragment-ktx:${fragmentktx_version}" - implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" - implementation "androidx.navigation:navigation-ui-ktx:$nav_version" - implementation "com.google.android.material:material:$material_version" - - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - - implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}" - implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}" - implementation("com.github.tony19:logback-android-classic:1.1.1-6") { - exclude group: "com.google.android", module: "android" - } - implementation "org.apache.commons:commons-lang3:$commonslang3_version" - implementation 'org.slf4j:slf4j-api:1.7.30' - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" - implementation 'com.madgag.spongycastle:core:1.58.0.0' - implementation("com.google.android:flexbox:0.3.0") { - exclude group: "com.android.support" - } - implementation("io.socket:socket.io-client:1.0.0") { - // excluding org.json which is provided by Android - exclude group: "org.json", module: "json" - } - implementation "com.google.code.gson:gson:2.8.6" - implementation('com.google.guava:guava:30.0-jre') { - exclude group: "com.google.code.findbugs", module: "jsr305" - } - implementation 'com.google.code.findbugs:jsr305:3.0.2' - - implementation 'net.danlew:android.joda:2.10.6' - - implementation 'org.mozilla:rhino:1.7.13' - - implementation 'com.github.DavidProdinger:weekdays-selector:1.1.0' - - implementation 'com.github.kenglxn.QRGen:android:2.6.0' - implementation 'com.eatthepath:java-otp:0.2.0' testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20200518' @@ -323,21 +256,6 @@ dependencies { testImplementation "org.skyscreamer:jsonassert:1.5.0" testImplementation "org.hamcrest:hamcrest-all:1.3" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - - // new for tidepool - implementation "com.squareup.okhttp3:okhttp:$okhttp3Version" - implementation "com.squareup.okhttp3:logging-interceptor:$okhttp3Version" - implementation "com.squareup.retrofit2:retrofit:$retrofit2Version" - implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit2Version" - implementation "com.squareup.retrofit2:converter-gson:$retrofit2Version" - - // Phone checker - implementation 'com.scottyab:rootbeer-lib:0.0.8' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha03' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test:rules:1.3.0-beta01' @@ -346,8 +264,8 @@ dependencies { /* Dagger2 - We are going to use dagger.android which includes * support for Activity and fragment injection so we need to include * the following dependencies */ - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" + + annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" @@ -356,15 +274,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - - //WorkManager - implementation "androidx.work:work-runtime:$work_version" - implementation "androidx.work:work-runtime-ktx:$work_version" - implementation "androidx.work:work-rxjava2:$work_version" - - implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0' - - implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' } /* diff --git a/build.gradle b/build.gradle index a0e146a95d..c8042d3613 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,10 @@ buildscript { work_version = '2.4.0' junit_version = '4.13.1' + powermockVersion = "1.7.3" + dexmakerVersion = "1.2" + retrofit2Version = '2.9.0' + okhttp3Version = '4.9.0' } repositories { google() diff --git a/core/build.gradle b/core/build.gradle index ae8f3de3ec..a2ef0589a1 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -41,54 +41,120 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation 'androidx.biometric:biometric:1.0.1' - implementation "androidx.activity:activity-ktx:${activityVersion}" - api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" - implementation "com.google.android.material:material:$material_version" - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" + api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" + api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" + api "androidx.core:core-ktx:$coreVersion" + api 'androidx.legacy:legacy-support-v13:1.0.0' + api 'androidx.legacy:legacy-support-v4:1.0.0' + api "androidx.appcompat:appcompat:$appcompat_verison" + api "androidx.preference:preference-ktx:$preferencektx_version" + api 'androidx.biometric:biometric:1.0.1' + api "androidx.activity:activity-ktx:${activityVersion}" + api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" + api 'androidx.cardview:cardview:1.0.0' + api 'androidx.recyclerview:recyclerview:1.1.0' + api 'androidx.gridlayout:gridlayout:1.0.0' + api 'androidx.percentlayout:percentlayout:1.0.0' + api "com.google.android.material:material:$material_version" + + api "com.google.dagger:dagger-android:$dagger_version" + api "com.google.dagger:dagger-android-support:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" //Logger - implementation 'org.slf4j:slf4j-api:1.7.30' - //Fabric - implementation platform('com.google.firebase:firebase-bom:25.12.0') - implementation "com.google.firebase:firebase-analytics-ktx" - implementation "com.google.firebase:firebase-crashlytics-ktx" - implementation "com.google.firebase:firebase-messaging-ktx" + api 'org.slf4j:slf4j-api:1.7.30' + api("com.github.tony19:logback-android-classic:1.1.1-6") { + exclude group: "com.google.android", module: "android" + } + + //Firebase + api platform('com.google.firebase:firebase-bom:25.12.0') + api "com.google.firebase:firebase-analytics-ktx" + api "com.google.firebase:firebase-crashlytics-ktx" + api "com.google.firebase:firebase-messaging-ktx" + api 'com.google.firebase:firebase-auth-ktx' + api 'com.google.firebase:firebase-database-ktx' //RxBus - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - implementation "org.apache.commons:commons-lang3:$commonslang3_version" + api "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" + api "org.apache.commons:commons-lang3:$commonslang3_version" //CryptoUtil - implementation 'com.madgag.spongycastle:core:1.58.0.0' + api 'com.madgag.spongycastle:core:1.58.0.0' // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" + api "com.jjoe64:graphview:4.0.1" //DateUtil - implementation 'net.danlew:android.joda:2.10.6' + api 'net.danlew:android.joda:2.10.6' //db - implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}" - implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}" + api "com.j256.ormlite:ormlite-core:${ormLiteVersion}" + api "com.j256.ormlite:ormlite-android:${ormLiteVersion}" // pumpCommon - implementation "com.google.code.gson:gson:2.8.6" + api "com.google.code.gson:gson:2.8.6" // don't kill my app api('dev.doubledot.doki:library:0.0.1@aar') { transitive = true } + //WorkManager + api "androidx.work:work-runtime:$work_version" + api "androidx.work:work-runtime-ktx:$work_version" + api "androidx.work:work-rxjava2:$work_version" + api 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0' + api 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' + + // new for tidepool + api "com.squareup.okhttp3:okhttp:$okhttp3Version" + api "com.squareup.okhttp3:logging-interceptor:$okhttp3Version" + api "com.squareup.retrofit2:retrofit:$retrofit2Version" + api "com.squareup.retrofit2:adapter-rxjava2:$retrofit2Version" + api "com.squareup.retrofit2:converter-gson:$retrofit2Version" + + api "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" + api 'net.danlew:android.joda:2.10.6' + + api "androidx.fragment:fragment-ktx:${fragmentktx_version}" + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + api 'androidx.navigation:navigation-runtime-ktx:2.3.1' + api "androidx.navigation:navigation-fragment-ktx:$nav_version" + api "androidx.navigation:navigation-ui-ktx:$nav_version" + + api 'com.google.android.gms:play-services-wearable:17.0.0' + api 'com.google.android.gms:play-services-location:17.1.0' + + api("com.google.android:flexbox:0.3.0") { + exclude group: "com.android.support" + } + api("io.socket:socket.io-client:1.0.0") { + // excluding org.json which is provided by Android + exclude group: "org.json", module: "json" + } + + api('com.google.guava:guava:30.0-jre') { + exclude group: "com.google.code.findbugs", module: "jsr305" + } + api 'com.google.code.findbugs:jsr305:3.0.2' + + api 'org.mozilla:rhino:1.7.13' + + api 'com.github.DavidProdinger:weekdays-selector:1.1.0' + + api 'com.github.kenglxn.QRGen:android:2.6.0' + api 'com.eatthepath:java-otp:0.2.0' + + // Phone checker + api 'com.scottyab:rootbeer-lib:0.0.8' + testImplementation "junit:junit:$junit_version" androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/dana/build.gradle b/dana/build.gradle index c7b03630d0..1963c76e5a 100644 --- a/dana/build.gradle +++ b/dana/build.gradle @@ -43,27 +43,7 @@ dependencies { implementation project(':core') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation "androidx.core:core-ktx:$coreVersion" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - - implementation 'net.danlew:android.joda:2.10.6' - - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - - implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" - - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" diff --git a/danar/build.gradle b/danar/build.gradle index be3f1d96ef..db0420b0ea 100644 --- a/danar/build.gradle +++ b/danar/build.gradle @@ -45,31 +45,12 @@ dependencies { implementation project(':dana') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation "androidx.core:core-ktx:$coreVersion" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - - implementation 'net.danlew:android.joda:2.10.6' - - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" - //RxBus - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - testImplementation "junit:junit:$junit_version" androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/danars/build.gradle b/danars/build.gradle index a7f88c5795..0cefa939d9 100644 --- a/danars/build.gradle +++ b/danars/build.gradle @@ -44,31 +44,14 @@ dependencies { implementation project(':dana') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "androidx.appcompat:appcompat:$appcompat_verison" implementation "androidx.core:core-ktx:$coreVersion" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - - implementation 'net.danlew:android.joda:2.10.6' - - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" - //RxBus - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - testImplementation "junit:junit:$junit_version" androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/medtronic/build.gradle b/medtronic/build.gradle index 6637c94d4d..d1cf679432 100644 --- a/medtronic/build.gradle +++ b/medtronic/build.gradle @@ -44,34 +44,7 @@ dependencies { implementation project(':rileylink') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation "androidx.core:core-ktx:$coreVersion" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - implementation "com.google.android.material:material:$material_version" - - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - - implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" - - // medtronic - start - implementation "org.apache.commons:commons-lang3:$commonslang3_version" - implementation 'net.danlew:android.joda:2.10.6' - implementation 'org.slf4j:slf4j-api:1.7.30' - implementation "com.google.code.gson:gson:2.8.6" - // medtronic - end - - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" diff --git a/omnipod/build.gradle b/omnipod/build.gradle index 46f11bf653..9ec0f706e1 100644 --- a/omnipod/build.gradle +++ b/omnipod/build.gradle @@ -3,10 +3,6 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -ext { - powermockVersion = "1.7.3" -} - android { compileSdkVersion 28 @@ -45,11 +41,9 @@ android { allprojects { repositories { - jcenter() flatDir { dirs 'libs' } - maven { url 'https://jitpack.io' } } } @@ -58,45 +52,12 @@ dependencies { implementation project(':rileylink') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation "androidx.core:core-ktx:$coreVersion" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - implementation "androidx.fragment:fragment-ktx:${fragmentktx_version}" - implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - implementation "com.google.android.material:material:$material_version" - - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - - implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" - - implementation "org.apache.commons:commons-lang3:$commonslang3_version" - implementation 'net.danlew:android.joda:2.10.6' - implementation "com.google.code.gson:gson:2.8.6" - - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" - implementation 'androidx.navigation:navigation-runtime:2.3.1' annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" - // Navigation - implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" - implementation "androidx.navigation:navigation-ui-ktx:$nav_version" - - implementation "com.google.android.material:material:$material_version" - testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:2.8.47" testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion" diff --git a/rileylink/build.gradle b/rileylink/build.gradle index c5ac276ef1..1963c76e5a 100644 --- a/rileylink/build.gradle +++ b/rileylink/build.gradle @@ -43,33 +43,7 @@ dependencies { implementation project(':core') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "androidx.appcompat:appcompat:$appcompat_verison" - implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation "androidx.core:core-ktx:$coreVersion" - implementation "androidx.preference:preference-ktx:$preferencektx_version" - implementation "androidx.activity:activity-ktx:${activityVersion}" - implementation "com.google.android.material:material:$material_version" - - implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}" - - // Graphview cannot be upgraded - implementation "com.jjoe64:graphview:4.0.1" - - implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" - - // rileylink - start - implementation "org.apache.commons:commons-lang3:$commonslang3_version" - implementation 'net.danlew:android.joda:2.10.6' - implementation 'org.slf4j:slf4j-api:1.7.30' - // rileylink - end - - implementation "com.google.dagger:dagger-android:$dagger_version" - implementation "com.google.dagger:dagger-android-support:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" diff --git a/wear/build.gradle b/wear/build.gradle index 1e66bec826..c0d1d5fb22 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -20,7 +20,6 @@ jacoco { ext { wearableVersion = "2.4.0" playServicesWearable = "17.0.0" - powermockVersion = "1.7.3" } def generateGitBuild = { ->