Skip to content

Commit 3a959ca

Browse files
committed
[UPDATE] Increase version for gradle, dependencies
1 parent 474415a commit 3a959ca

File tree

9 files changed

+150
-146
lines changed

9 files changed

+150
-146
lines changed

AndroidTestingBlueprint-kotlinApp/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ android {
7373
dependencies {
7474
// App's dependencies, including test
7575
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion"
76-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
76+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
7777

7878
implementation project(':module-plain-kotlin') // Optional module for non-Android code
7979
implementation project(':module-android-library') // Optional module for additional Android code
8080

8181
// Dependencies for local unit tests
8282
testImplementation "junit:junit:$rootProject.ext.junitVersion"
83-
testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
83+
testImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoVersion"
8484
testImplementation "org.hamcrest:hamcrest-all:$rootProject.ext.hamcrestVersion"
8585

8686
// Android Testing Support Library's runner and rules
@@ -103,4 +103,4 @@ dependencies {
103103
// Resolve conflicts between main and test APK:
104104
androidTestImplementation "com.android.support:support-annotations:$rootProject.supportLibVersion"
105105

106-
}
106+
}

AndroidTestingBlueprint-kotlinApp/build.gradle

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,29 @@
33
buildscript {
44
ext {
55
minSdkVersion = 14
6-
targetSdkVersion = 27
7-
compileSdkVersion = 27
6+
targetSdkVersion = 28
7+
compileSdkVersion = 28
88

9-
kotlinVersion = "1.2.0"
10-
supportLibVersion = "27.0.2"
9+
gradleVersion = "3.3.2"
10+
kotlinVersion = "1.3.21"
11+
supportLibVersion = "28.0.0"
1112
junitVersion = "4.12"
12-
mockitoVersion = "1.10.19"
13+
mockitoVersion = "2.25.1"
1314
hamcrestVersion = "1.3"
14-
runnerVersion = "0.5"
15-
rulesVersion = "0.5"
16-
espressoVersion = "2.2.2"
15+
runnerVersion = "1.0.2"
16+
rulesVersion = "1.0.2"
17+
espressoVersion = "3.0.0"
1718
uiautomatorVersion = "2.1.2"
1819
}
1920

2021
repositories {
2122
jcenter()
23+
mavenCentral()
2224
google()
2325
}
2426

2527
dependencies {
26-
classpath 'com.android.tools.build:gradle:3.0.1'
28+
classpath "com.android.tools.build:gradle:$gradleVersion"
2729
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2830

2931
// NOTE: Do not place your application dependencies here; they belong
@@ -34,6 +36,7 @@ buildscript {
3436
allprojects {
3537
repositories {
3638
jcenter()
39+
mavenCentral()
3740
google()
3841
}
39-
}
42+
}
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Dec 06 13:05:10 GMT 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip

AndroidTestingBlueprint-kotlinApp/gradlew

Lines changed: 43 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidTestingBlueprint-kotlinApp/gradlew.bat

Lines changed: 84 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)