Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
77cfcae7
Commit
77cfcae7
authored
5 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
gradle: add ndk version
Change-Id: Ib2d5e1135dbf7a8c14fb8a390f879ed9dc1e330c
parent
240dbfa8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker/Dockerfile
+2
-2
2 additions, 2 deletions
docker/Dockerfile
ring-android/app/build.gradle
+3
-2
3 additions, 2 deletions
ring-android/app/build.gradle
ring-android/libringclient/build.gradle
+2
-2
2 additions, 2 deletions
ring-android/libringclient/build.gradle
with
7 additions
and
6 deletions
docker/Dockerfile
+
2
−
2
View file @
77cfcae7
...
@@ -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;2
0
.0.
5594570
'
ndk;2
1
.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/2
0
.0.
5594570
ENV
ANDROID_NDK=/opt/android-sdk/ndk/2
1
.0.
6113669
WORKDIR
/home/builder/src
WORKDIR
/home/builder/src
VOLUME
/home/builder/src
VOLUME
/home/builder/src
This diff is collapsed.
Click to expand it.
ring-android/app/build.gradle
+
3
−
2
View file @
77cfcae7
...
@@ -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-rc0
1
'
def
material_version
=
'1.1.0-rc0
2
'
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'
)
...
...
This diff is collapsed.
Click to expand it.
ring-android/libringclient/build.gradle
+
2
−
2
View file @
77cfcae7
...
@@ -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.1
2
'
testCompile
'junit:junit:4.1
3
'
// 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
'
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment