Merge pull request #603 from nightscout/adrian/test-flexbox-circleci

update flexbox, delete maven repository, update jacoco

app/build.gradle

@@ -6,15 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.google.firebase.crashlytics'
 
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
-
-jacoco {
-    toolVersion = "0.8.6"
-}
-
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 repositories {
     mavenCentral()

automation/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 
 dependencies {

build.gradle

@@ -64,7 +64,6 @@ allprojects {
         mavenCentral()
         maven { url "https://maven.google.com" }
         maven { url 'https://jitpack.io' }
-        maven { url "https://google.bintray.com/flexbox-layout" }
         ivy {
             url 'https://github.com/'
             patternLayout {

combo/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

core/build.gradle

@@ -8,7 +8,7 @@ apply from: 'core_dependencies.gradle'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':database')

core/core_dependencies.gradle

@@ -87,7 +87,7 @@ dependencies {
     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:2.0.1")
+    api("com.google.android.flexbox:flexbox:3.0.0")
     api("io.socket:socket.io-client:1.0.0") {
         // excluding org.json which is provided by Android
         exclude group: "org.json", module: "json"

dana/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 android {
     defaultConfig {

danar/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

danars/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 android {
     ndkVersion "21.1.6352462"

diaconn/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 android {
     defaultConfig {

gradle/jacoco_global.gradle

@@ -0,0 +1,8 @@
+jacoco {
+    toolVersion = "0.8.7"
+}
+
+tasks.withType(Test) {
+    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']
+}

insight/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 android {
     defaultConfig {

medtronic/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

omnipod-common/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

omnipod-dash/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

omnipod-eros/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

pump-common/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

rileylink/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
-
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')

wear/build.gradle

@@ -15,7 +15,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.hiya.jacoco-android'
 
 jacoco {
-    toolVersion = "0.8.6"
+    toolVersion = "0.8.7"
+}
+
+tasks.withType(Test) {
+    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']
 }
 
 ext {