Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2017-12-21 13:41:04 -05:00
parent 295ddc42aa 02c2a9aeef
commit ce9946b24a
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -1,7 +1,6 @@
language: android language: android
jdk: jdk:
- oraclejdk8
- openjdk8 - openjdk8
android: android:
@@ -14,17 +13,8 @@ android:
- extra-android-m2repository - extra-android-m2repository
- addon-google_apis-google-26 - addon-google_apis-google-26
licenses:
- 'android-sdk-preview-license-52d11cd2'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'
before_script:
- echo "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/Sdk/licenses/android-sdk-license
script: script:
- ./gradlew clean desktop:dist - ./gradlew desktop:dist
- ./gradlew clean android:build
after_success: after_success:
- chmod +x upload-build.sh - chmod +x upload-build.sh