caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Gradle 6.1.1

Browse source
This commit is contained in:
Milos Kozak 2020-07-28 23:49:21 +02:00
parent 3fa7903076
commit 3d7f2c5980
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle
View file

@ -1,10 +1,12 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
} }
dependencies { dependencies {
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
classpath 'com.hiya:jacoco-android:0.2'
} }
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
@ -12,7 +14,8 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
apply plugin: 'jacoco-android' //apply plugin: 'jacoco-android'
apply plugin: 'com.hiya.jacoco-android'
apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.google.firebase.crashlytics'
jacoco { jacoco {

2
build.gradle
View file

@ -20,7 +20,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat Feb 29 21:28:06 CET 2020 #Tue Jul 28 23:15:57 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

9
wear/build.gradle
View file

@ -1,14 +1,17 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
} }
dependencies { dependencies {
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
classpath 'com.hiya:jacoco-android:0.2'
} }
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'jacoco-android' //apply plugin: 'jacoco-android'
apply plugin: 'com.hiya.jacoco-android'
jacoco { jacoco {
toolVersion = "0.8.3" toolVersion = "0.8.3"
@ -125,7 +128,7 @@ dependencies {
testImplementation 'junit:junit:4.13' testImplementation 'junit:junit:4.13'
testImplementation 'org.json:json:20200518' testImplementation 'org.json:json:20200518'
testImplementation ("org.mockito:mockito-core:2.8.47") { testImplementation("org.mockito:mockito-core:2.8.47") {
exclude group: 'net.bytebuddy', module: 'byte-buddy' exclude group: 'net.bytebuddy', module: 'byte-buddy'
exclude group: 'net.bytebuddy', module: 'byte-buddy-android' exclude group: 'net.bytebuddy', module: 'byte-buddy-android'
exclude group: 'net.bytebuddy', module: 'byte-buddy-agent' exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'