Merge pull request #368 from DreierF/develop

Prepare 3.1.0
DreierF · Jul 31, 2018 · 197aeb2 · 197aeb2
2 parents 09341ea + ecf8298
commit 197aeb2
Show file tree

Hide file tree

Showing 1,076 changed files with 24,920 additions and 9,043 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,7 @@ wearable/wearable.iml
 # User-specific stuff:
 .idea/**/workspace.xml
 .idea/**/tasks.xml
+.idea/caches/**
 
 # Gradle:
 .idea/**/gradle.xml

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/dictionaries/florian.xml b/.idea/dictionaries/florian.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.travis.yml b/.travis.yml
@@ -45,7 +45,7 @@ script:
 - echo -en 'travis_fold:end:script.build\\r'
 
 - echo -e '\033[0;33mUnit tests...\033[0m' && echo -en 'travis_fold:start:script.unittest\\r'
-- ./gradlew testRelease jacocoTestReport -PdisablePreDex
+- ./gradlew testRelease -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'

diff --git a/MyTargets.iml b/MyTargets.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="MyTargets" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="MyTargets" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/README.md b/README.md
@@ -23,4 +23,4 @@ If you don't have a concrete idea, there a few issues in the backlog with some r
 If you want to help improve the translations of the app you can do so at https://crowdin.com/project/mytargets
 
 ## Licence ##
-Released under GNU GLP V2
+Released under GNU GPL V2
diff --git a/Screengrabfile b/Screengrabfile
@@ -3,8 +3,8 @@ use_tests_in_packages ['de.dreier.mytargets.screengrab']
 
 output_directory 'build/screengrab'
 
-app_apk_path 'app/build/outputs/apk/app-screengrab-debug.apk'
-tests_apk_path 'app/build/outputs/apk/app-screengrab-debug-androidTest.apk'
+app_apk_path 'app/build/outputs/apk/screengrab/debug/app-screengrab-debug.apk'
+tests_apk_path 'app/build/outputs/apk/androidTest/screengrab/debug/app-screengrab-debug-androidTest.apk'
 
 locales ['ca-ES', 'cs-CZ', 'da-DK', 'de-DE', 'en-US', 'es-ES', 'fr-FR', 'hu-HU', 'id-ID', 'it-IT', 'iw-IL', 'ja-JP', 'nl-NL', 'no-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sk-SK', 'sl-SI', 'sv-SE', 'tr-TR', 'zh-CN', 'zh-TW']