Merge pull request #603 from nightscout/adrian/test-flexbox-circleci
update flexbox, delete maven repository, update jacoco
This commit is contained in:
commit
9020ca1696
19 changed files with 30 additions and 23 deletions
|
@ -6,15 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply plugin: 'com.google.firebase.crashlytics'
|
apply plugin: 'com.google.firebase.crashlytics'
|
||||||
|
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
jacoco {
|
|
||||||
toolVersion = "0.8.6"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(Test) {
|
|
||||||
jacoco.includeNoLocationClasses = true
|
|
||||||
jacoco.excludes = ['jdk.internal.*']
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|
|
@ -6,6 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -64,7 +64,6 @@ allprojects {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "https://maven.google.com" }
|
maven { url "https://maven.google.com" }
|
||||||
maven { url 'https://jitpack.io' }
|
maven { url 'https://jitpack.io' }
|
||||||
maven { url "https://google.bintray.com/flexbox-layout" }
|
|
||||||
ivy {
|
ivy {
|
||||||
url 'https://github.com/'
|
url 'https://github.com/'
|
||||||
patternLayout {
|
patternLayout {
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -8,7 +8,7 @@ apply from: 'core_dependencies.gradle'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':database')
|
implementation project(':database')
|
||||||
|
|
|
@ -87,7 +87,7 @@ dependencies {
|
||||||
api 'com.google.android.gms:play-services-wearable:17.0.0'
|
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.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") {
|
api("io.socket:socket.io-client:1.0.0") {
|
||||||
// excluding org.json which is provided by Android
|
// excluding org.json which is provided by Android
|
||||||
exclude group: "org.json", module: "json"
|
exclude group: "org.json", module: "json"
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -6,6 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
ndkVersion "21.1.6352462"
|
ndkVersion "21.1.6352462"
|
||||||
|
|
|
@ -6,6 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
8
gradle/jacoco_global.gradle
Normal file
8
gradle/jacoco_global.gradle
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
jacoco {
|
||||||
|
toolVersion = "0.8.7"
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(Test) {
|
||||||
|
jacoco.includeNoLocationClasses = true
|
||||||
|
jacoco.excludes = ['jdk.internal.*']
|
||||||
|
}
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -7,7 +7,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
||||||
|
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':core')
|
implementation project(':core')
|
||||||
|
|
|
@ -15,7 +15,12 @@ apply plugin: 'kotlin-android'
|
||||||
apply plugin: 'com.hiya.jacoco-android'
|
apply plugin: 'com.hiya.jacoco-android'
|
||||||
|
|
||||||
jacoco {
|
jacoco {
|
||||||
toolVersion = "0.8.6"
|
toolVersion = "0.8.7"
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(Test) {
|
||||||
|
jacoco.includeNoLocationClasses = true
|
||||||
|
jacoco.excludes = ['jdk.internal.*']
|
||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
|
|
Loading…
Reference in a new issue