Permalink
Browse files

Merge branch 'master' into feature/#255

  • Loading branch information...
spyhunter99 committed Oct 24, 2016
2 parents 906cca4 + 5d12c95 commit 6ef8bbe531fd20addf5897f8478440112b86aa96
Showing 949 changed files with 102,083 additions and 5,090 deletions.
@@ -36,11 +36,13 @@ build/
.gradle
# vim swap files
*.swp
*.swp`
*.swo
OSMMapTilePackager/src/main/java/org/osmdroid/tileprovider/util/StreamUtils.java
OSMMapTilePackager/src/main/java/org/osmdroid/tileprovider/util/GEMFFile.java
OSMMapTilePackager/src/main/java/org/osmdroid/util/GEMFFile.java
OSMMapTilePackager/src/main/java/org/osmdroid/api/
OpenStreetMapViewer/src/androidTest/
docs/
@@ -4,8 +4,10 @@ android:
components:
# The BuildTools version used by your project
- tools
- platform-tools
- build-tools-23.0.2 # 23.0.2 was not available on build
- build-tools-23.0.1
- build-tools-23.0.3
# The SDK version used to compile your project
- android-24
- android-23
@@ -44,19 +46,31 @@ sudo: required
# fun fact, travis doesn't really support multiple AVDs running currently for a single build (tried it, build timed out constantly while starting up the AVDs)
# thus we're using a build matrix (which makes more sense anyhow)
env:
global:
#minutes (2 minutes by default), prevents CommandShellUnresponsiveExceptions
- ADB_INSTALL_TIMEOUT=14
matrix:
#note when changing these, updating the gradle build file for the GoogleWrapper project
# first env var is just for display purposes
#api8 with google
- API=8g ANDROID_TARGET=13 ANDROID_ABI=armeabi
#api8
- ANDROID_TARGET=12 ANDROID_ABI=armeabi
- API=8 ANDROID_TARGET=1 ANDROID_ABI=armeabi
#api10
- ANDROID_TARGET=13 ANDROID_ABI=armeabi
- API=10 ANDROID_TARGET=2 ANDROID_ABI=armeabi
#api10 with google
- API=10g ANDROID_TARGET=13 ANDROID_ABI=armeabi
#api15
- ANDROID_TARGET=14 ANDROID_ABI=armeabi-v7a
- API=15 ANDROID_TARGET=3 ANDROID_ABI=armeabi-v7a
#api15 with google
- API=15g ANDROID_TARGET=15 ANDROID_ABI=armeabi-v7a
#api19
- ANDROID_TARGET=16 ANDROID_ABI=armeabi-v7a
- API=19 ANDROID_TARGET=7 ANDROID_ABI=armeabi-v7a
#api19 with google
# disabling, the system image is no longer available on travis - API=19g ANDROID_TARGET=16 ANDROID_ABI=armeabi-v7a
#api21
#- ANDROID_TARGET=17 ANDROID_ABI=armeabi-v7a no abi available?
#- ANDROID_TARGET=17 ANDROID_ABI=armeabi-v7a no abi available with google apis
#api22
# ANDROID_TARGET=18 ANDROID_ABI=x86 not currently possible with travis, missing some kind of hardware acceleration driver
#api23
@@ -65,38 +79,61 @@ env:
before_install:
# create and start emulators
- android list targets
- echo no | android create avd --force -n test$ANDROID_TARGET -t $ANDROID_TARGET --abi $ANDROID_ABI --sdcard 100M
- echo no | android create avd --force -n test$ANDROID_TARGET -t $ANDROID_TARGET --abi $ANDROID_ABI --sdcard 200M
- emulator -memory 1536 -avd test$ANDROID_TARGET -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
# mvn sdk deploy
before_script:
# android list
- mkdir temp
- cd temp
- git clone https://github.com/simpligility/maven-android-sdk-deployer
- cd maven-android-sdk-deployer
- mvn clean install -fn -B -U
- cd ..
- cd ..
# TEMPORARY comment out of the maven build since it's broken at the moment
#- mkdir temp
#- cd temp
#- git clone https://github.com/simpligility/maven-android-sdk-deployer
#- cd maven-android-sdk-deployer
#- mvn clean install -fn -B -U
#- cd ..
#- cd ..
- android-wait-for-emulator
- adb shell input keyevent 82 &
#setup for maps forge adapter
#- wget http://download.mapsforge.org/maps/world/world.map
- adb shell ls /
- adb shell ls /sdcard/
- adb shell ls /sdcard/osmdroid
- adb root
- adb shell mount -o rw,remount rootfs /
- adb shell chmod 777 /mnt/sdcard
- adb shell mkdir /sdcard/osmdroid/
- adb push osmdroid-forge-app/world.map /sdcard/osmdroid/world.map
#- adb push resources/usgsbase.gemf /sdcard/osmdroid/usgsbase.gemf
#- adb push resources/usgstopo.sqlite /sdcard/osmdroid/usgstopo.sqlite
#- adb push resources/usgssat.zip /sdcard/osmdroid/usgssat.zip
#build
script:
#build using maven with integration tests
#we build 3 times due to issues with the maven-android-plugin. root cause is unknown but seems to be related to how artifacts are resolved for android projects
#in case you're wondering -fn means fail never, which loosely means, if the build fails, the exit code is always 0, which is basically all CI engines look for.
- mvn clean install -fn -B -U
- mvn install -fn -B -U
- mvn install
- mvn android:undeploy
#the dist profile adds the zip and tar outputs of all javadocs and source jars
#- ./travis.sh
#- mvn install -fn -B -U -Pdist
#- mvn install -Pdist
#- mvn android:undeploy
#build using gradle
- gradle -version
# travis_wait 30 https://docs.travis-ci.com/user/common-build-problems/#My-builds-are-timing-out
- ./gradlew -version
- ./gradlew clean connectedCheck
- travis_wait 60 ./gradlew clean connectedCheck
# fun fact, maven runs android tests concurrently for all connected devices, gradle does not
# since we're using build matrix, each build target compiles the source, fires up it's specific vm, runs the tests, then exits.
# --stacktrace
after_failure:
# run this on failure
- adb pull /sdcard/osmdroid/crash.log
- cat crash.log
# dumps the log then exits
- adb logcat -d
Oops, something went wrong.

0 comments on commit 6ef8bbe

Please sign in to comment.