kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Bump build-tools to 23.0.2

Browse Source
This commit is contained in:
Daniel Martí 2015-11-05 11:55:19 +01:00
parent d9d11ba11b
commit 66e82cb077
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -23,9 +23,9 @@ before_script:
- export ANDROID_HOME=$PWD/android-sdk - export ANDROID_HOME=$PWD/android-sdk
- export PATH="$ANDROID_HOME/tools:$PATH" - export PATH="$ANDROID_HOME/tools:$PATH"
- echo " == Installing Android SDK components" - echo " == Installing Android SDK components"
- echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.1 - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.2
- export PATH="$ANDROID_HOME/platform-tools:$PATH" - export PATH="$ANDROID_HOME/platform-tools:$PATH"
- export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH" - export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH"
test: test:
script: script:

2
buildserver/cookbooks/android-sdk/recipes/default.rb
View File

@ -26,7 +26,7 @@ end
script "add_build_tools" do script "add_build_tools" do
interpreter "bash" interpreter "bash"
user user user user
ver = "23.0.1" ver = "23.0.2"
cwd "/tmp" cwd "/tmp"
code " code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then

2
examples/config.py
View File

@ -23,7 +23,7 @@
# } # }
# Build tools version to be used # Build tools version to be used
# build_tools = "23.0.1" # build_tools = "23.0.2"
# Command or path to binary for running Ant # Command or path to binary for running Ant
# ant = "ant" # ant = "ant"

2
fdroidserver/common.py
View File

@ -56,7 +56,7 @@ default_config = {
'r9b': None, 'r9b': None,
'r10e': "$ANDROID_NDK", 'r10e': "$ANDROID_NDK",
}, },
'build_tools': "23.0.1", 'build_tools': "23.0.2",
'java_paths': { 'java_paths': {
'1.7': "/usr/lib/jvm/java-7-openjdk", '1.7': "/usr/lib/jvm/java-7-openjdk",
'1.8': None, '1.8': None,