mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03:00
Update sdk and build-tools
This commit is contained in:
parent
b63ce63017
commit
a50e6dbfbd
3 changed files with 6 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
||||||
sdk_path = "/home/vagrant/android-sdk"
|
sdk_path = "/home/vagrant/android-sdk"
|
||||||
ndk_path = "/home/vagrant/android-ndk"
|
ndk_path = "/home/vagrant/android-ndk"
|
||||||
build_tools = "19.0.3"
|
build_tools = "19.1.0"
|
||||||
ant = "ant"
|
ant = "ant"
|
||||||
mvn3 = "mvn"
|
mvn3 = "mvn"
|
||||||
gradle = "gradle"
|
gradle = "gradle"
|
||||||
|
|
|
@ -8,7 +8,7 @@ script "setup-android-sdk" do
|
||||||
user user
|
user user
|
||||||
cwd "/tmp"
|
cwd "/tmp"
|
||||||
code "
|
code "
|
||||||
tar zxvf /vagrant/cache/android-sdk_r22.3-linux.tgz
|
tar zxvf /vagrant/cache/android-sdk_r22.6.2-linux.tgz
|
||||||
mv android-sdk-linux #{sdk_loc}
|
mv android-sdk-linux #{sdk_loc}
|
||||||
#{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
|
#{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
|
||||||
#{sdk_loc}/tools/android update sdk --no-ui -t tool
|
#{sdk_loc}/tools/android update sdk --no-ui -t tool
|
||||||
|
@ -32,7 +32,7 @@ end
|
||||||
script "add_build_tools" do
|
script "add_build_tools" do
|
||||||
interpreter "bash"
|
interpreter "bash"
|
||||||
user user
|
user user
|
||||||
ver = "19.0.3"
|
ver = "19.1.0"
|
||||||
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
|
||||||
|
@ -51,7 +51,6 @@ X
|
||||||
not_if "test -d #{sdk_loc}/build-tools/#{ver}"
|
not_if "test -d #{sdk_loc}/build-tools/#{ver}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# This is currently 19.0.1
|
|
||||||
script "add_platform_tools" do
|
script "add_platform_tools" do
|
||||||
interpreter "bash"
|
interpreter "bash"
|
||||||
user user
|
user user
|
||||||
|
|
|
@ -62,9 +62,9 @@ if not os.path.exists(cachedir):
|
||||||
os.mkdir(cachedir)
|
os.mkdir(cachedir)
|
||||||
|
|
||||||
cachefiles = [
|
cachefiles = [
|
||||||
('android-sdk_r22.6-linux.tgz',
|
('android-sdk_r22.6.2-linux.tgz',
|
||||||
'https://dl.google.com/android/android-sdk_r22.6-linux.tgz',
|
'https://dl.google.com/android/android-sdk_r22.6.2-linux.tgz',
|
||||||
'da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f'),
|
''),
|
||||||
('gradle-1.4-bin.zip',
|
('gradle-1.4-bin.zip',
|
||||||
'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
|
'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
|
||||||
'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
|
'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue