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
6ddd0c00
Commit
6ddd0c00
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
docker: update tools
Change-Id: Id6e92ee15a8eb3f063abcb057aa20443baee4eb1
parent
cbef9d63
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/Dockerfile
+2
-2
2 additions, 2 deletions
docker/Dockerfile
ring-android/app/build.gradle
+1
-1
1 addition, 1 deletion
ring-android/app/build.gradle
with
3 additions
and
3 deletions
docker/Dockerfile
+
2
−
2
View file @
6ddd0c00
...
...
@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&&
update-java-alternatives
--set
java-1.8.0-openjdk
# Android SDK tools
RUN
wget
-O
/tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-
3859397
.zip
&&
\
RUN
wget
-O
/tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-
4333796
.zip
&&
\
mkdir
-p
/opt/android-sdk
&&
\
unzip
-q
-d
/opt/android-sdk /tmp/android-tools.zip
&&
\
rm
-f
/tmp/android-tools.zip
&&
\
...
...
@@ -51,7 +51,7 @@ RUN (while sleep 1; do echo "y"; done) | sdkmanager --update
# Android SDK libraries, NDK
ENV
ANDROID_DEPS=\
'build-tools;28.0.
2
\
'build-tools;28.0.
3
\
platforms;android-28 \
extras;android;m2repository \
extras;google;m2repository \
...
...
This diff is collapsed.
Click to expand it.
ring-android/app/build.gradle
+
1
−
1
View file @
6ddd0c00
...
...
@@ -4,7 +4,7 @@ def buildFirebase = project.hasProperty('buildFirebase') || getGradle().getStart
android
{
compileSdkVersion
28
buildToolsVersion
'28.0.
2
'
buildToolsVersion
'28.0.
3
'
defaultConfig
{
minSdkVersion
19
targetSdkVersion
28
...
...
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