Merge branch 'develop'

.gitignore

@@ -41,7 +41,6 @@ wearable/wearable.iml
 # User-specific stuff:
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
 
 # Gradle:
 .idea/**/gradle.xml

.travis.yml

@@ -3,14 +3,11 @@ jdk:
 - oraclejdk8
 env:
   global:
-  - ADB_INSTALL_TIMEOUT=8
-  - ANDROID_API_LEVEL=26
-  - ANDROID_BUILD_TOOLS_VERSION=26.0.2
-  - EMULATOR_API_LEVEL=19
-  - ANDROID_ABI=armeabi-v7a
-  - JAVA7_HOME=/usr/lib/jvm/java-7-oracle
-  - JAVA8_HOME=/usr/lib/jvm/java-8-oracle
-  - JAVA_HOME=$JAVA8_HOME
+  # - ADB_INSTALL_TIMEOUT=8
+  - ANDROID_API_LEVEL=27
+  - ANDROID_BUILD_TOOLS_VERSION=27.0.2
+  # - ANDROID_ABI=armeabi-v7a
+  # - EMULATOR_API_LEVEL=21
   - PWD=`pwd`
 android:
   components:
@@ -19,27 +16,28 @@ android:
   - tools
   - build-tools-$ANDROID_BUILD_TOOLS_VERSION
   - android-$ANDROID_API_LEVEL
-  - android-$EMULATOR_API_LEVEL
-  # Google Play Services
+  # - android-$EMULATOR_API_LEVEL
   - extra-google-google_play_services
-  # Support library
-  - extra-android-support
-  # Latest artifacts in local repository
   - extra-google-m2repository
   - extra-android-m2repository
-  # Specify at least one system image
-  - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL
+  # - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL
 before_install:
 - openssl aes-256-cbc -K $encrypted_143bf53fc355_key -iv $encrypted_143bf53fc355_iv -in services.tar.enc -out services.tar -d
 - tar xvf services.tar
 - wget https://raw.githubusercontent.com/JakeWharton/pidcat/master/pidcat.py
+- touch ~/.android/repositories.cfg
+- yes | sdkmanager "platforms;android-27"
+- mkdir -p "$ANDROID_HOME/licenses"
+- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+- echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
+- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 install:
 # Converts the shallow clone to a full clone
 # This is necessary in order to determine the current app version code
 - git fetch --unshallow --tags
 before_script:
-- echo no | android create avd -f -n test -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI -s WVGA800 -c 128M
-- emulator -avd test -no-audio -no-window &
+# - echo no | android create avd -f -n test -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI -s WVGA800 -c 128M
+# - emulator -avd test -no-audio -no-window &
 - ./gradlew clean
 script:
 - echo -e '\033[0;33mBuilding...\033[0m' && echo -en 'travis_fold:start:script.build\\r'
@@ -50,15 +48,16 @@ script:
 - ./gradlew testRelease jacocoTestReport -PdisablePreDex
 - echo -en 'travis_fold:end:script.unittest\\r'
 
-- echo -e '\033[0;33mUI tests...\033[0m' && echo -en 'travis_fold:start:script.uitest\\r'
-- android-wait-for-emulator
-- adb shell settings put global window_animation_scale 0
-- adb shell settings put global transition_animation_scale 0
-- adb shell settings put global animator_duration_scale 0
-- adb shell input keyevent 82 &
-- adb logcat -c
-- travis_wait ./gradlew createRegularDebugCoverageReport -PdisablePreDex
-- echo -en 'travis_fold:end:script.uitest\\r'
+# - echo -e '\033[0;33mUI tests...\033[0m' && echo -en 'travis_fold:start:script.uitest\\r'
+# - ./gradlew :app:assembleDevDebug :app:assembleDevDebugAndroidTest -PdisablePreDex
+# - android-wait-for-emulator
+# - adb shell settings put global window_animation_scale 0
+# - adb shell settings put global transition_animation_scale 0
+# - adb shell settings put global animator_duration_scale 0
+# - adb shell input keyevent 82 &
+# - adb logcat -c
+# - travis_wait 40 ./gradlew createDevDebugCoverageReport -PdisablePreDex
+# - echo -en 'travis_fold:end:script.uitest\\r'
 
 after_success:
 - |
@@ -68,16 +67,18 @@ after_success:
     ./dropbox_uploader.sh upload app/build/outputs/apk/regular/release/app-regular-release.apk /Release/$TRAVIS_TAG/MyTargets.apk
     ./dropbox_uploader.sh upload app/build/outputs/mapping/regular/release/mapping.txt /Release/$TRAVIS_TAG/mapping.txt
   fi
-- bash <(curl -s https://codecov.io/bash)
-- ./gradlew sendCoverageToCodacy -PdisablePreDex
+# - bash <(curl -s https://codecov.io/bash)
+# - ./gradlew sendCoverageToCodacy -PdisablePreDex
 after_failure:
-- >
-  adb logcat -d 2>&1 | python pidcat.py de.dreier.mytargets.debug | tee logcat.log &&
-  cd app/build/reports/androidTests/connected/flavors/REGULAR/ &&
-  mv ../../../../../../../logcat.log logcat.log &&
-  zip -r reports.zip . &&
-  cd ../../../../../../.. &&
-  ./dropbox_uploader.sh upload app/build/reports/androidTests/connected/flavors/REGULAR/reports.zip /Reports/$TRAVIS_JOB_NUMBER.zip
+# - adb logcat -d 2>&1 | python pidcat.py de.dreier.mytargets.debug &> logcat.log
+# - ./dropbox_uploader.sh upload logcat.log /Reports/$TRAVIS_JOB_NUMBER.logcat
+# - >
+#   cd app/build/reports/androidTests/connected/flavors/DEV/ &&
+#   ( adb pull /sdcard/screenshots/ || true ) &&
+#   mv ../../../../../../../logcat.log logcat.log &&
+#   zip -r reports.zip . &&
+#   cd ../../../../../../.. &&
+#   ./dropbox_uploader.sh upload app/build/reports/androidTests/connected/flavors/DEV/reports.zip /Reports/$TRAVIS_JOB_NUMBER.zip
 deploy:
   provider: releases
   skip_cleanup: true

README.md

@@ -14,9 +14,7 @@ Android app, which helps archers keep track of their training progress.
 </a>
 
 ## Build ##
-The project can be built using Android Studio 2.1 or newer.
-
-In order to correctly compile it you have to install JDK 7 AND JDK 8 and set the environment variables accordingly. More information this can be found [here](https://github.com/evant/gradle-retrolambda/blob/master/README.md).
+The project is written in Kotlin and therefore can be built using Android Studio 3.0 or newer.
 
 ## Contribute
 Every contribution is very welcome.