diff --git a/.travis.yml b/.travis.yml index 04e6c67..f0281e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,27 +3,16 @@ language: shell os: - linux - windows -osx_image: xcode10.1 -dist: bionic -addons: - apt: - packages: - - make - - git - - zlib1g-dev - - libssl-dev - - gperf - - php - - cmake - - openjdk-11-jdk-headless - - g++ - - ccache - - maven - arch: - amd64 - arm64 - +osx_image: xcode10.1 +dist: bionic +before_install: + - sudo apt-get -y install make git zlib1g-dev libssl-dev gperf php cmake openjdk-11-jdk-headless g++ ccache maven +addons: + apt: + update: true cache: bundler: true cocoapods: true diff --git a/travis/linux.sh b/travis/linux.sh index 77928be..070d576 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -3,10 +3,6 @@ mkdir $TRAVIS_BUILD_DIR/out cd src/main/jni -sudo apt-get install openjdk-11-jdk-headless -export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)" -export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)/bin" - export TD_SRC_DIR=${PWD}/td export TD_BIN_DIR=${PWD}/jtdlib/td export JAVA_SRC_DIR=$(dirname `pwd`)/java