build: bump tools
* use gradle 3.3
* use gradle plugin 2.3
* use support library 25.2.0
* use NDK r14
Change-Id: I5bb1e677116d8ddb582ace1ab09a01a0688221c2
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c0919ff..501c0c1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -49,15 +49,15 @@
# Android Linux NDK
# See http://developer.android.com/tools/sdk/ndk/index.html
-RUN wget -O /tmp/android-ndk.zip http://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip && \
+RUN wget -O /tmp/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip && \
unzip /tmp/android-ndk.zip -d /opt/ && \
rm -f /tmp/android-ndk.zip && \
- chown -R root:root /opt/android-ndk-r13b
+ chown -R root:root /opt/android-ndk-r14
# Other tools and resources of Android SDK
ENV ANDROID_HOME=/opt/android-sdk
ENV ANDROID_SDK=/opt/android-sdk
-ENV ANDROID_NDK=/opt/android-ndk-r13b
+ENV ANDROID_NDK=/opt/android-ndk-r14
ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 8986fb4..4e79ce9 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -9,12 +9,12 @@
compile fileTree(include: '*.jar', dir: 'libs')
compile project(':libringclient')
- compile 'com.android.support:support-v13:25.1.1'
- compile 'com.android.support:design:25.1.1'
- compile 'com.android.support:cardview-v7:25.1.1'
- compile 'com.android.support:preference-v14:25.1.1'
- compile 'com.android.support:recyclerview-v7:25.1.1'
- compile 'com.android.support:appcompat-v7:25.1.1'
+ compile 'com.android.support:support-v13:25.2.0'
+ compile 'com.android.support:design:25.2.0'
+ compile 'com.android.support:cardview-v7:25.2.0'
+ compile 'com.android.support:preference-v14:25.2.0'
+ compile 'com.android.support:recyclerview-v7:25.2.0'
+ compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.jayway.android.robotium:robotium-solo:5.4.1'
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
diff --git a/ring-android/build.gradle b/ring-android/build.gradle
index 4b77554..7cf64fe 100644
--- a/ring-android/build.gradle
+++ b/ring-android/build.gradle
@@ -4,7 +4,7 @@
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
+ classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
// NOTE: Do not place your application dependencies here; they belong
@@ -20,5 +20,5 @@
dependencies {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1' //version required
+ gradleVersion = '3.3' //version required
}
diff --git a/ring-android/gradle/wrapper/gradle-wrapper.properties b/ring-android/gradle/wrapper/gradle-wrapper.properties
index 17faa2b..3718ea2 100644
--- a/ring-android/gradle/wrapper/gradle-wrapper.properties
+++ b/ring-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 09 11:15:04 EDT 2016
+#Fri Mar 03 14:43:03 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip