Skip to content

Commit 299e405

Browse files
vbabenkoruvbabenkoru
authored
[MOB-1501] Update Gradle and dependencies (#226)
[MOB-1501] Update Gradle and dependencies
2 parents c1620b8 + 84ff717 commit 299e405

File tree

6 files changed

+29
-25
lines changed

6 files changed

+29
-25
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ script:
7171
after_script:
7272
- ./cc-test-reporter format-coverage app/build/reports/jacoco/jacocoDebugTestReport/jacocoDebugTestReport.xml --input-type jacoco
7373
- ./cc-test-reporter format-coverage iterableapi/build/reports/coverage/debug/report.xml --input-type jacoco
74-
- ./cc-test-reporter format-coverage iterableapi/build/reports/jacoco/jacocoTestDebugUnitTestReport/jacocoTestDebugUnitTestReport.xml --input-type jacoco
74+
- ./cc-test-reporter format-coverage iterableapi/build/jacoco/jacoco.xml --input-type jacoco
7575
- ./cc-test-reporter format-coverage app/build/reports/jacoco/jacocoDebugAndroidTestReport/jacocoDebugAndroidTestReport.xml --input-type jacoco
7676
- ./cc-test-reporter upload-coverage
7777

‎app/build.gradle

+17-16
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ dependencies {
6161
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
6262
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
6363
androidTestImplementation 'androidx.test:rules:1.2.0'
64+
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
6465
androidTestImplementation 'org.mockito:mockito-android:3.0.0'
6566
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
6667
androidTestImplementation 'androidx.test.espresso:espresso-web:3.2.0'
@@ -98,17 +99,17 @@ task jacocoDebugTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest'])
9899
'**/*$ModuleAdapter.class',
99100
'**/*$ViewInjector*.class',
100101
]
101-
def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter) //we use "debug" build type for test coverage (can be other)
102-
def sdkTree = fileTree(dir: "${buildDir}/../../iterableapi/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter)
103-
def sdkUiTree = fileTree(dir: "${buildDir}/../../iterableapi-ui/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter)
102+
def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/classes", excludes: fileFilter) //we use "debug" build type for test coverage (can be other)
103+
def sdkTree = fileTree(dir: "${buildDir}/../../iterableapi/build/intermediates/javac/debug/classes", excludes: fileFilter)
104+
def sdkUiTree = fileTree(dir: "${buildDir}/../../iterableapi-ui/build/intermediates/javac/debug/classes", excludes: fileFilter)
104105
def mainSrc = "${project.projectDir}/src/main/java"
105106
def sdkSrc = "${project.projectDir}/../iterableapi/src/main/java"
106107
def sdkUiSrc = "${project.projectDir}/../iterableapi-ui/src/main/java"
107-
sourceDirectories = files([mainSrc])
108-
classDirectories = files([debugTree])
109-
additionalSourceDirs = files([sdkSrc, sdkUiSrc])
110-
additionalClassDirs = files([sdkTree, sdkUiTree])
111-
executionData = fileTree(dir: "$buildDir", includes: [
108+
sourceDirectories.from = files([mainSrc])
109+
classDirectories.from = files([debugTree])
110+
additionalSourceDirs.from = files([sdkSrc, sdkUiSrc])
111+
additionalClassDirs.from = files([sdkTree, sdkUiTree])
112+
executionData.from = fileTree(dir: "$buildDir", includes: [
112113
"jacoco/testDebugUnitTest.exec"
113114
])
114115
}
@@ -140,15 +141,15 @@ task jacocoDebugAndroidTestReport(type: JacocoReport, dependsOn: ['connectedChec
140141
'**/*$ModuleAdapter.class',
141142
'**/*$ViewInjector*.class',
142143
]
143-
def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter) //we use "debug" build type for test coverage (can be other)
144-
def sdkTree = fileTree(dir: "${buildDir}/../../iterableapi/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter)
145-
def sdkUiTree = fileTree(dir: "${buildDir}/../../iterableapi-ui/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter)
144+
def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/classes", excludes: fileFilter) //we use "debug" build type for test coverage (can be other)
145+
def sdkTree = fileTree(dir: "${buildDir}/../../iterableapi/build/intermediates/javac/debug/classes", excludes: fileFilter)
146+
def sdkUiTree = fileTree(dir: "${buildDir}/../../iterableapi-ui/build/intermediates/javac/debug/classes", excludes: fileFilter)
146147
def mainSrc = "${project.projectDir}/src/main/java"
147148
def sdkSrc = "${project.projectDir}/../iterableapi/src/main/java"
148149
def sdkUiSrc = "${project.projectDir}/../iterableapi-ui/src/main/java"
149-
sourceDirectories = files([mainSrc])
150-
classDirectories = files([debugTree])
151-
additionalSourceDirs = files([sdkSrc, sdkUiSrc])
152-
additionalClassDirs = files([sdkTree, sdkUiTree])
153-
executionData = fileTree(dir: "$buildDir", include: "outputs/code_coverage/debugAndroidTest/connected/*.ec")
150+
sourceDirectories.from = files([mainSrc])
151+
classDirectories.from = files([debugTree])
152+
additionalSourceDirs.from = files([sdkSrc, sdkUiSrc])
153+
additionalClassDirs.from = files([sdkTree, sdkUiTree])
154+
executionData.from = fileTree(dir: "$buildDir", include: "outputs/code_coverage/debugAndroidTest/connected/*.ec")
154155
}

‎app/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:tools="http://schemas.android.com/tools"
33
package="iterable.com.iterableapi">
4-
<uses-sdk tools:overrideLibrary="br.com.concretesolutions.kappuccino"/>
4+
<uses-sdk tools:overrideLibrary="br.com.concretesolutions.kappuccino,android_libs.ub_uiautomator"/>
55
</manifest>

‎build.gradle

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.3.71'
3+
ext.kotlin_version = '1.3.72'
44
repositories {
55
google()
66
jcenter()
7+
maven {
8+
url "https://plugins.gradle.org/m2/"
9+
}
710
}
811
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.4.2'
10-
classpath 'com.google.gms:google-services:4.2.0'
12+
classpath 'com.android.tools.build:gradle:3.6.3'
13+
classpath 'com.google.gms:google-services:4.3.3'
1114
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
classpath ('com.dicedmelon.gradle:jacoco-android:0.1.4') {
15+
classpath ('com.hiya:jacoco-android:0.2') {
1316
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
1417
}
1518
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Apr 11 14:59:26 PDT 2019
1+
#Tue Apr 28 13:23:09 PDT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

‎iterableapi/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'jacoco-android'
2+
apply plugin: 'com.hiya.jacoco-android'
33

44
android {
55
compileSdkVersion 28

0 commit comments

Comments
 (0)