From b2c56ba48e647bfb2ca1ebd3ba7d98da21c9ec66 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 11 Feb 2021 11:01:18 +0100 Subject: [PATCH] Update Omnipod Eros and Omnipod Dash build.gradle --- omnipod-dash/build.gradle | 23 +++++++++++++++++++---- omnipod-eros/build.gradle | 10 ---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle index 959e970c17..9521d7b4c2 100644 --- a/omnipod-dash/build.gradle +++ b/omnipod-dash/build.gradle @@ -1,10 +1,9 @@ -plugins { - id 'com.android.library' -} +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' android { compileSdkVersion 28 - buildToolsVersion "30.0.2" defaultConfig { minSdkVersion 24 @@ -16,11 +15,22 @@ android { consumerProguardFiles "consumer-rules.pro" } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + debug { + testCoverageEnabled(project.hasProperty('coverage')) + } + firebaseDisable { + System.setProperty("disableFirebase", "true") + ext.enableCrashlytics = false + } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -29,6 +39,11 @@ android { } dependencies { + 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" + implementation 'commons-codec:commons-codec:1.15' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle index 41548fa975..beb8c490bc 100644 --- a/omnipod-eros/build.gradle +++ b/omnipod-eros/build.gradle @@ -41,20 +41,10 @@ android { } } -allprojects { - repositories { - flatDir { - dirs 'libs' - } - } -} - dependencies { implementation project(':core') implementation project(':rileylink') - implementation fileTree(dir: 'libs', include: ['*.jar']) - 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"