travis-ci: update OSX CI build to work again

diff --git a/.travis.yml b/.travis.yml
index 58b28ebe796801a7df9f47250b4f007114492ee3..7a7ce68e5b062cdf5a31e0ca19499357b4272122 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,9 @@ matrix:
       # this doesn't actually work yet https://github.com/travis-ci/travis-ci/issues/5337
       dist: trusty
     - os: osx
-      osx_image: xcode8
-      env: ANDROID_HOME=/usr/local/opt/android-sdk
+      osx_image: xcode9
+      env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
+      env: ANDROID_HOME=/usr/local/share/android-sdk
 
 licenses:
   - 'android-sdk-preview-license-52d11cd2'
@@ -24,21 +25,32 @@ licenses:
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update > /dev/null;
-      brew install android-sdk dash gnu-sed jpeg python3;
-      sudo pip3 install pep8 pyflakes pylint;
+      brew install dash bash python3 gradle;
+      brew install gnu-sed --with-default-names;
+      brew cask install android-sdk;
+
+      mkdir -p "$ANDROID_HOME/licenses";
+      echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license";
+      echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license";
+      echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools";
+      echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;25.0.2";
+      echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23";
+
       sudo pip3 install -e  .;
       sudo rm -rf fdroidserver.egg-info;
-      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.2;
-      elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
-      sudo apt-get -q update -y;
-      sudo apt-get -q install -y --no-install-recommends python3 python3-dev
-      python3-git python3-pil python3-libcloud python3-logilab-astng
-      python3-paramiko python3-pip python3-pyasn1 python3-pyasn1-modules
-      python3-requests python3-venv python3-yaml rsync
-      pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev;
-      sudo pip3 install pylint;
-      fi
+
+      echo $PATH;
+      echo $JAVA_HOME;
+      /usr/libexec/java_home;
+      java -version;
+      which java;
+      javac -version;
+      which javac;
+      jarsigner -help;
+      which jarsigner;
+      keytool -help;
+      which keytool;
+    fi
 
 script:
   - cd tests
@@ -46,5 +58,4 @@ script:
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR
-  - ls -lRa env
   - ls -lR | curl -F 'clbin=<-' https://clbin.com