Skip to content

Commit 95517e4

Browse files
authored
Merge pull request commons-app#304 from whym/buildtools25
Upgrade build tools (25) and gradle plugin (2.2.2)
2 parents e449259 + b005274 commit 95517e4

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ android:
33
components:
44
- platform-tools
55
- tools
6-
- build-tools-23.0.3
6+
- build-tools-25.0.0
77
- extra-google-m2repository
88
- extra-android-m2repository
99
- android-23
1010
- sys-img-x86-android-18
11+
jdk:
12+
# - openjdk8 # not yet available
13+
- oraclejdk8

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol
2020

2121
### Requirements ###
2222

23-
1. [Android SDK][3] (Level 23)
24-
2. [Gradle][4]
23+
1. Java SDK 8 (OpenJDK 8 or Oracle Java SE 8)
24+
2. [Android SDK][3] (Level 23)
25+
3. [Gradle][4]
2526

2627
### Build Instructions ###
2728

app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ dependencies {
1111
compile 'ch.acra:acra:4.7.0'
1212
compile 'org.mediawiki:api:1.3'
1313
compile 'commons-codec:commons-codec:1.10'
14-
compile 'com.android.support:support-v4:23.4.0'
15-
compile 'com.android.support:appcompat-v7:23.4.0'
16-
compile 'com.android.support:design:23.4.0'
14+
compile 'com.android.support:support-v4:25.0.0'
15+
compile 'com.android.support:appcompat-v7:25.0.0'
16+
compile 'com.android.support:design:25.0.0'
1717

1818
testCompile 'junit:junit:4.12'
1919

@@ -23,7 +23,7 @@ dependencies {
2323

2424
android {
2525
compileSdkVersion 23
26-
buildToolsVersion "23.0.3"
26+
buildToolsVersion "25.0.0"
2727

2828
useLibrary 'org.apache.http.legacy'
2929

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.3'
8+
classpath 'com.android.tools.build:gradle:2.2.0'
99
}
1010
}
1111

0 commit comments

Comments
 (0)