Update many android tools

* Gradle from 1.7 to 1.8
* Android SDK from 21.0.1 to 22.2.1
* SDK Build Tools from 18.0.1 to 18.1.1
* Added legacy toolchains to NDK r9

diff --git a/buildserver/cookbooks/android-ndk/recipes/default.rb b/buildserver/cookbooks/android-ndk/recipes/default.rb
index 6a759a74e56fb7ed8f13221ab0772a3c18d7b9f7..8f45a2717ee2411a6c7ee4017baa98227640c4c8 100644 (file)
--- a/buildserver/cookbooks/android-ndk/recipes/default.rb
+++ b/buildserver/cookbooks/android-ndk/recipes/default.rb
@@ -26,6 +26,7 @@ script "setup-android-ndk" do
        SUFFIX=''
     fi
     tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX.tar.bz2
+    tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX-legacy-toolchains.tar.bz2
     mv android-ndk-r9 #{ndk_loc}
   "
   not_if do

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 222c14eaa544fa7de017d375fa212098cae19836..6af4140856d5703aea7dd652d4d9ae512f985e45 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -8,7 +8,7 @@ script "setup-android-sdk" do
   user user
   cwd "/tmp"
   code "
-    tar zxvf /vagrant/cache/android-sdk_r21.0.1-linux.tgz
+    tar zxvf /vagrant/cache/android-sdk_r22.2.1-linux.tgz
     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 tool
@@ -29,7 +29,7 @@ execute "add-android-home" do
   not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
 end
 
-%w{17.0.0 18.0.1}.each do |ver|
+%w{18.1.1}.each do |ver|
 
   script "add_build_tools_#{ver}" do
     interpreter "bash"

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 91691a60e68b57f62cdf06edabd66cdb1c63ee30..7da3a93aa4bbcb608eea5ce7fd1c2062499890d9 100644 (file)
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -19,8 +19,8 @@ script "install-gradle" do
   cwd "/tmp"
   interpreter "bash"
   code "
-    unzip /vagrant/cache/gradle-1.7-bin.zip
-    mv gradle-1.7 /opt/gradle
+    unzip /vagrant/cache/gradle-1.8-bin.zip
+    mv gradle-1.8 /opt/gradle
   "
   not_if "test -d /opt/gradle"
 end

diff --git a/config.buildserver.py b/config.buildserver.py
index 313833063a79c68f06ce30836b9035598f22f5d0..4e8af01a81b3743817e96dd8be846723e47e729c 100644 (file)
--- a/config.buildserver.py
+++ b/config.buildserver.py
@@ -1,7 +1,7 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_path = "/home/vagrant/android-ndk"
-build_tools = "18.0.1"
+build_tools = "18.1.1"
 javacc_path = "/usr/share/java"
 mvn3 = "mvn"
 gradle = "gradle"
-gradle_plugin = "0.5.+"
+gradle_plugin = "0.6.+"

diff --git a/config.sample.py b/config.sample.py
index 3756cc0ae109b200668adc751920c7f2608fd83c..6de1fcca8c23235cb2833b45607a9a346a907d68 100644 (file)
--- a/config.sample.py
+++ b/config.sample.py
@@ -6,10 +6,11 @@
 sdk_path = "/path/to/android-sdk-linux_86"
 
 # Path to the Android NDK ($ANDROID_NDK)
+# Legacy toolchains are only needed by some apps
 ndk_path = "/path/to/android-ndk-r9"
 
 # Build tools version to be used
-build_tools = "18.1"
+build_tools = "18.1.1"
 
 # Path to Android Java SWT ($ANDROID_SWT)
 javacc_path = "/usr/share/java"
@@ -21,7 +22,9 @@ mvn3 = "mvn3"
 gradle = "gradle"
 
 # Android gradle plugin version
-gradle_plugin = "0.5.+"
+# "0.5.+" -> gradle 1.7
+# "0.6.+" -> gradle 1.8
+gradle_plugin = "0.6.+"
 
 # Max height and width (in pixels) for the icons in the repo
 # This corresponds to 72x72 pixels, i.e. mdpi

diff --git a/makebuildserver.py b/makebuildserver.py
index 01b87aaa986865f8aac5713c3843dc484a90205a..f700f2b841f31e25f36a370abe9b07827eabcf33 100755 (executable)
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -48,22 +48,28 @@ cachedir = os.path.join('buildserver', 'cache')
 if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 cachefiles = [
-    ('android-sdk_r21.0.1-linux.tgz',
-     'http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz',
-     'e797ff3abbdc0fe2e7299e82e92ade830fa922ddd045d9a5a2d187c5c1a2661c'),
-    ('gradle-1.7-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.7-bin.zip',
-     '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30')]
+    ('android-sdk_r22.2.1-linux.tgz',
+     'http://dl.google.com/android/android-sdk_r22.2.1-linux.tgz',
+     '17ea4610008985eb1454b3b25ad00c59300cee3141f7ea3deec98f45d862faa5'),
+    ('gradle-1.8-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.8-bin.zip',
+     'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703')]
 if arch64:
     cachefiles.extend([
     ('android-ndk-r9-linux-x64_64.tar.bz2',
      'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2',
-     '8a6013bfd8a8709592c53086c4f841933f5f2b175dd030326406d24ff4daa267')])
+     '8a6013bfd8a8709592c53086c4f841933f5f2b175dd030326406d24ff4daa267'),
+    ('android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2',
+     'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2',
+     '087fbca38a1a2c1a309de272d22e84bbc1c3e2254211761180572fde75faab27')])
 else:
     cachefiles.extend([
     ('android-ndk-r9-linux-x86.tar.bz2',
      'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2',
-     '30f3da01e4d8d3415777b5d88a0b70fac5a4620807fd28110f9bc4c8093f6b6e')])
+     '30f3da01e4d8d3415777b5d88a0b70fac5a4620807fd28110f9bc4c8093f6b6e'),
+    ('android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2',
+     'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2',
+     '26b94f0a5d686b4892cb22b06094751efded0958baed380b2ccce56517fd830b')])
 wanted = []
 for f, src, shasum in cachefiles:
     if not os.path.exists(os.path.join(cachedir, f)):