From 77cfcae79469f332f4ff18fd35d2855a20ac7919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 22 Jan 2020 23:46:42 -0500
Subject: [PATCH] gradle: add ndk version
Change-Id: Ib2d5e1135dbf7a8c14fb8a390f879ed9dc1e330c
---
docker/Dockerfile | 4 ++--
ring-android/app/build.gradle | 5 +++--
ring-android/libringclient/build.gradle | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ad3a07896..00f7dd21e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -53,10 +53,10 @@ ENV ANDROID_DEPS=\
platforms;android-29 \
extras;android;m2repository \
extras;google;m2repository \
- ndk;20.0.5594570'
+ ndk;21.0.6113669'
RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
ENV ANDROID_SDK=/opt/android-sdk
-ENV ANDROID_NDK=/opt/android-sdk/ndk/20.0.5594570
+ENV ANDROID_NDK=/opt/android-sdk/ndk/21.0.6113669
WORKDIR /home/builder/src
VOLUME /home/builder/src
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 1d3fd8f2a..8b2a60698 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -5,6 +5,7 @@ def buildFirebase = project.hasProperty('buildFirebase') || getGradle().getStart
android {
compileSdkVersion 29
buildToolsVersion '29.0.2'
+ ndkVersion "21.0.6113669"
defaultConfig {
minSdkVersion 21
targetSdkVersion 29
@@ -69,8 +70,8 @@ android {
dependencies {
def android_support_core_version = '1.1.0'
def android_support_version = '1.0.0'
- def material_version = '1.1.0-rc01'
- def butterknife_version = '10.2.0'
+ def material_version = '1.1.0-rc02'
+ def butterknife_version = '10.2.1'
def dagger_version = '2.24'
implementation fileTree(include: '*.jar', dir: 'libs')
diff --git a/ring-android/libringclient/build.gradle b/ring-android/libringclient/build.gradle
index a7d0ee472..d605bcf54 100644
--- a/ring-android/libringclient/build.gradle
+++ b/ring-android/libringclient/build.gradle
@@ -17,13 +17,13 @@ dependencies {
compile 'com.j256.ormlite:ormlite-core:5.1'
// Required -- JUnit 4 framework
- testCompile 'junit:junit:4.12'
+ testCompile 'junit:junit:4.13'
// RxJava
compile "io.reactivex.rxjava2:rxjava:2.2.16"
// gson
- compile 'com.google.code.gson:gson:2.8.5'
+ compile 'com.google.code.gson:gson:2.8.6'
}
--
GitLab