Skip to content

Commit 6ddf5f3

Browse files
Merge pull request #1298 from nextcloud/supportLib2540
Update Support, Test libraries and gradle plugin
2 parents 5b12aaf + 4987054 commit 6ddf5f3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
google()
1515
}
1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
17+
classpath 'com.android.tools.build:gradle:3.0.0-beta1'
1818
classpath 'com.google.gms:google-services:3.0.0'
1919
}
2020
}
@@ -30,7 +30,7 @@ configurations.all {
3030
}
3131

3232
ext {
33-
supportLibraryVersion = '25.2.0'
33+
supportLibraryVersion = '25.4.0'
3434
googleLibraryVersion = '10.2.4'
3535

3636
travisBuild = System.getenv("TRAVIS") == "true"
@@ -184,7 +184,7 @@ dependencies {
184184
/// dependencies for app building
185185
implementation name: 'touch-image-view'
186186
implementation 'com.android.support:multidex:1.0.2'
187-
implementation 'com.github.nextcloud:android-library:1.0.23'
187+
implementation 'com.github.nextcloud:android-library:1.0.24'
188188
implementation "com.android.support:support-v4:${supportLibraryVersion}"
189189
implementation "com.android.support:design:${supportLibraryVersion}"
190190
implementation 'com.jakewharton:disklrucache:2.0.2'
@@ -212,13 +212,13 @@ dependencies {
212212
testImplementation 'org.mockito:mockito-core:1.10.19'
213213
/// dependencies for instrumented tests
214214
// JUnit4 Rules
215-
androidTestImplementation 'com.android.support.test:rules:0.5'
215+
androidTestImplementation 'com.android.support.test:rules:1.0.0'
216216
// Android JUnit Runner
217-
androidTestImplementation 'com.android.support.test:runner:0.5'
217+
androidTestImplementation 'com.android.support.test:runner:1.0.0'
218218
// Android Annotation Support
219219
androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
220220
// Espresso core
221-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
221+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.0'
222222
// UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
223223
//androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
224224
// fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details

scripts/lint/lint-results.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
DO NOT TOUCH; GENERATED BY DRONE
2-
<span class="mdl-layout-title">Lint Report: 1 error and 632 warnings</span>
2+
<span class="mdl-layout-title">Lint Report: 1 error and 608 warnings</span>

0 commit comments

Comments
 (0)