Skip to content

Commit d73108c

Browse files
committed
CB-13289: Fix test to work with new Google Android Gradle DSL
1 parent 93efe71 commit d73108c

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

test/app/build.gradle

+10-11
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
apply plugin: 'com.android.application'
2020

2121
android {
22-
compileSdkVersion 25
23-
buildToolsVersion "25.0.2"
22+
compileSdkVersion 26
23+
buildToolsVersion "26.0.2"
2424
defaultConfig {
2525
applicationId "org.apache.cordova.unittests"
2626
minSdkVersion 16
27-
targetSdkVersion 25
27+
targetSdkVersion 26
2828
versionCode 1
2929
versionName "1.0"
3030
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -38,16 +38,15 @@ android {
3838
}
3939

4040
dependencies {
41-
compile fileTree(dir: 'libs', include: ['*.jar'])
42-
debugCompile project(path: ":CordovaLib", configuration: "debug")
43-
releaseCompile project(path: ":CordovaLib", configuration: "release")
44-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
41+
implementation fileTree(dir: 'libs', include: ['*.jar'])
42+
implementation project(path: ":CordovaLib")
43+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
4544
exclude group: 'com.android.support', module: 'support-annotations'
4645
})
47-
androidTestCompile ('com.android.support.test.espresso:espresso-web:2.2.2', {
46+
androidTestImplementation ('com.android.support.test.espresso:espresso-web:2.2.2', {
4847
exclude group: 'com.android.support', module: 'support-annotations'
4948
})
50-
compile 'com.android.support:appcompat-v7:25.1.1'
51-
testCompile 'junit:junit:4.12'
52-
testCompile 'org.json:json:20140107'
49+
implementation 'com.android.support:appcompat-v7:26.1.0'
50+
testImplementation 'junit:junit:4.12'
51+
testImplementation 'org.json:json:20140107'
5352
}

test/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
buildscript {
2222
repositories {
2323
jcenter()
24+
google()
2425
}
2526
dependencies {
26-
classpath 'com.android.tools.build:gradle:2.3.0'
27+
classpath 'com.android.tools.build:gradle:3.0.0'
2728

2829
// NOTE: Do not place your application dependencies here; they belong
2930
// in the individual module build.gradle files
@@ -33,6 +34,7 @@ buildscript {
3334
allprojects {
3435
repositories {
3536
jcenter()
37+
google()
3638
}
3739
}
3840

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 22 10:51:47 PDT 2017
1+
#Wed Oct 25 11:17:25 PDT 2017
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-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)