Skip to content
Snippets Groups Projects
Commit 77cfcae7 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

gradle: add ndk version

Change-Id: Ib2d5e1135dbf7a8c14fb8a390f879ed9dc1e330c
parent 240dbfa8
Branches
Tags
No related merge requests found
...@@ -53,10 +53,10 @@ ENV ANDROID_DEPS=\ ...@@ -53,10 +53,10 @@ ENV ANDROID_DEPS=\
platforms;android-29 \ platforms;android-29 \
extras;android;m2repository \ extras;android;m2repository \
extras;google;m2repository \ extras;google;m2repository \
ndk;20.0.5594570' ndk;21.0.6113669'
RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
ENV ANDROID_SDK=/opt/android-sdk 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 WORKDIR /home/builder/src
VOLUME /home/builder/src VOLUME /home/builder/src
...@@ -5,6 +5,7 @@ def buildFirebase = project.hasProperty('buildFirebase') || getGradle().getStart ...@@ -5,6 +5,7 @@ def buildFirebase = project.hasProperty('buildFirebase') || getGradle().getStart
android { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion '29.0.2' buildToolsVersion '29.0.2'
ndkVersion "21.0.6113669"
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
...@@ -69,8 +70,8 @@ android { ...@@ -69,8 +70,8 @@ android {
dependencies { dependencies {
def android_support_core_version = '1.1.0' def android_support_core_version = '1.1.0'
def android_support_version = '1.0.0' def android_support_version = '1.0.0'
def material_version = '1.1.0-rc01' def material_version = '1.1.0-rc02'
def butterknife_version = '10.2.0' def butterknife_version = '10.2.1'
def dagger_version = '2.24' def dagger_version = '2.24'
implementation fileTree(include: '*.jar', dir: 'libs') implementation fileTree(include: '*.jar', dir: 'libs')
......
...@@ -17,13 +17,13 @@ dependencies { ...@@ -17,13 +17,13 @@ dependencies {
compile 'com.j256.ormlite:ormlite-core:5.1' compile 'com.j256.ormlite:ormlite-core:5.1'
// Required -- JUnit 4 framework // Required -- JUnit 4 framework
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.13'
// RxJava // RxJava
compile "io.reactivex.rxjava2:rxjava:2.2.16" compile "io.reactivex.rxjava2:rxjava:2.2.16"
// gson // gson
compile 'com.google.code.gson:gson:2.8.5' compile 'com.google.code.gson:gson:2.8.6'
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment