diff --git a/app/build.gradle b/app/build.gradle index b0f0547e90..9fade3c32b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -225,6 +225,8 @@ dependencies { // MainApp api "com.uber.rxdogtag2:rxdogtag:2.0.1" + // DataLayerListenerService + api "com.google.android.gms:play-services-wearable:$play_services_wearable_version" } apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" diff --git a/build.gradle b/build.gradle index be7c8dbb20..31ece7c158 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ buildscript { json_version = '20220320' serialization_version = '1.4.1' joda_version = '2.12.1' + swipe_version = '1.1.0' junit_version = '4.13.2' mockito_version = '4.4.0' diff --git a/core/core-main/build.gradle b/core/core-main/build.gradle index 9125fb55f6..9cb96a63ac 100644 --- a/core/core-main/build.gradle +++ b/core/core-main/build.gradle @@ -23,59 +23,22 @@ dependencies { implementation project(':core:ui') api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" - api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - api "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines_version" - api "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutines_version" - - api "androidx.activity:activity-ktx:$activity_version" - api "androidx.appcompat:appcompat:$appcompat_version" - - api 'androidx.biometric:biometric:1.1.0' - - api 'androidx.cardview:cardview:1.0.0' - api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - api "androidx.core:core-ktx:$core_version" - api "androidx.fragment:fragment-ktx:$fragmentktx_version" - api 'androidx.legacy:legacy-support-v13:1.0.0' - api 'androidx.legacy:legacy-support-v4:1.0.0' - api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" - api "androidx.lifecycle:lifecycle-process:$lifecycle_version" - api "androidx.navigation:navigation-fragment-ktx:$nav_version" - api "androidx.navigation:navigation-runtime-ktx:$nav_version" - api "androidx.navigation:navigation-ui-ktx:$nav_version" - api 'androidx.percentlayout:percentlayout:1.0.0' - api 'androidx.recyclerview:recyclerview:1.2.1' - - api 'androidx.gridlayout:gridlayout: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" - - api "com.google.android.gms:play-services-wearable:$play_services_wearable_version" - api "com.google.android.gms:play-services-location:$play_services_location_version" api 'com.google.guava:guava:31.1-jre' - api "androidx.work:work-rxjava3:$work_version" + api "androidx.activity:activity-ktx:$activity_version" + api "androidx.appcompat:appcompat:$appcompat_version" + api 'androidx.biometric:biometric:1.1.0' + api "com.google.dagger:dagger-android:$dagger_version" + api "com.google.dagger:dagger-android-support:$dagger_version" //CryptoUtil api 'com.madgag.spongycastle:core:1.58.0.0' api "com.google.crypto.tink:tink-android:$tink_version" //WorkManager - api "androidx.work:work-runtime:$work_version" - api "androidx.work:work-runtime-ktx:$work_version" - //api "androidx.work:work-rxjava3:$work_version" - //api 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' - - - api "commons-codec:commons-codec:$commonscodec_version" - + api "androidx.work:work-runtime:$work_version" // DataWorkerStorage } android { diff --git a/insight/build.gradle b/insight/build.gradle index 6e5bc131cc..94a41ddbbc 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -38,4 +38,6 @@ dependencies { api "androidx.room:room-runtime:$room_version" api "androidx.room:room-rxjava3:$room_version" kapt "androidx.room:room-compiler:$room_version" + + api "com.google.android.material:material:$material_version" } \ No newline at end of file diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle index 8aa25674c8..82991ec3b2 100644 --- a/plugins/aps/build.gradle +++ b/plugins/aps/build.gradle @@ -26,6 +26,7 @@ dependencies { implementation project(':interfaces') api "androidx.appcompat:appcompat:$appcompat_version" + api "androidx.swiperefreshlayout:swiperefreshlayout:$swipe_version" // APS api 'org.mozilla:rhino:1.7.14' diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle index 150713a3d9..545488c54d 100644 --- a/plugins/automation/build.gradle +++ b/plugins/automation/build.gradle @@ -28,4 +28,5 @@ dependencies { implementation project(':interfaces') api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + api "com.google.android.gms:play-services-location:$play_services_location_version" } \ No newline at end of file diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle index 55629955bc..1f74f3341e 100644 --- a/plugins/main/build.gradle +++ b/plugins/main/build.gradle @@ -54,4 +54,8 @@ dependencies { // Overview api 'com.google.android.flexbox:flexbox:3.0.0' + + // Food + api "androidx.work:work-runtime:$work_version" + api "androidx.work:work-runtime-ktx:$work_version" } \ No newline at end of file diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle index e445bc5d99..4174e66704 100644 --- a/pump/omnipod-common/build.gradle +++ b/pump/omnipod-common/build.gradle @@ -24,4 +24,8 @@ dependencies { implementation project(':interfaces') api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + api "androidx.fragment:fragment-ktx:$fragmentktx_version" + api "androidx.navigation:navigation-fragment-ktx:$nav_version" + + api "com.google.android.material:material:$material_version" } \ No newline at end of file