diff options
author | Camil Staps | 2015-08-05 14:30:07 +0200 |
---|---|---|
committer | Camil Staps | 2015-08-05 14:30:07 +0200 |
commit | 62aa8903023ce17c4166c9396904c169ca8e1133 (patch) | |
tree | 4c46c44871da4a743832742ddab7847e90209502 | |
parent | Ignore apk files (diff) |
Cleanup; travis CI
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .idea/.name | 1 | ||||
-rw-r--r-- | .idea/compiler.xml | 23 | ||||
-rw-r--r-- | .idea/copyright/profiles_settings.xml | 3 | ||||
-rw-r--r-- | .idea/encodings.xml | 5 | ||||
-rw-r--r-- | .idea/gradle.xml | 18 | ||||
-rw-r--r-- | .idea/misc.xml | 26 | ||||
-rw-r--r-- | .idea/modules.xml | 10 | ||||
-rw-r--r-- | .idea/scopes/scope_settings.xml | 5 | ||||
-rw-r--r-- | .idea/vcs.xml | 8 | ||||
-rw-r--r-- | .travis.yml | 25 | ||||
-rw-r--r-- | Taizé.iml | 6 | ||||
-rw-r--r-- | app/app.iml | 8 | ||||
-rw-r--r-- | app/src/main/java/com/camilstaps/taize/Taize.java | 2 |
14 files changed, 35 insertions, 108 deletions
@@ -1,7 +1,6 @@ .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries +/.idea .DS_Store /build *.apk diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index ea9cb82..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Taizé
\ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af47..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" value="Javac" /> - <resourceExtensions /> - <wildcardResourcePatterns> - <entry name="!?*.java" /> - <entry name="!?*.form" /> - <entry name="!?*.class" /> - <entry name="!?*.groovy" /> - <entry name="!?*.scala" /> - <entry name="!?*.flex" /> - <entry name="!?*.kt" /> - <entry name="!?*.clj" /> - </wildcardResourcePatterns> - <annotationProcessing> - <profile default="true" name="Default" enabled="false"> - <processorPath useClasspath="true" /> - </profile> - </annotationProcessing> - </component> -</project> - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ -<component name="CopyrightManager"> - <settings default="" /> -</component>
\ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> -</project> - diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 736c7b5..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="GradleSettings"> - <option name="linkedExternalProjectsSettings"> - <GradleProjectSettings> - <option name="distributionType" value="DEFAULT_WRAPPED" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="modules"> - <set> - <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/app" /> - </set> - </option> - </GradleProjectSettings> - </option> - </component> -</project> - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 58ff01f..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="EntryPointsManager"> - <entry_points version="2.0" /> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/build/classes" /> - </component> - <component name="masterDetails"> - <states> - <state key="ProjectJDKs.UI"> - <settings> - <last-edited>1.7</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - </states> - </component> -</project> - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index b7d3f25..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/Taizé.iml" filepath="$PROJECT_DIR$/Taizé.iml" /> - <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> - </modules> - </component> -</project> - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ -<component name="DependencyValidationManager"> - <state> - <option name="SKIP_IMPORT_STATEMENTS" value="false" /> - </state> -</component>
\ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 9d32e50..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="" /> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> - </component> -</project> - diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4562817 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +language: android +android: + components: + # Uncomment the lines below if you want to + # use the latest revision of Android SDK Tools + # - platform-tools + # - tools + + # The BuildTools version used by your project + - build-tools-21.1.2 + + # The SDK version used to compile your project + - android-21 + + # Additional components + #- extra-google-google_play_services + #- extra-google-m2repository + #- extra-android-m2repository + #- addon-google_apis-google-19 + - extra-android-support + + # Specify at least one system image, + # if you need to run emulator(s) during your tests + - sys-img-armeabi-v7a-android-19 + - sys-img-x86-android-17 @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<module 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="Taizé" 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"> <component name="FacetManager"> <facet type="java-gradle" name="Java-Gradle"> <configuration> <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> + <option name="BUILDABLE" value="false" /> </configuration> </facet> </component> @@ -15,5 +16,4 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/app/app.iml b/app/app.iml index f697a90..64b22e5 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Taizé" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Taizé" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -12,8 +12,9 @@ <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> + <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> + <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" /> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> @@ -92,5 +93,4 @@ <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" /> <orderEntry type="library" exported="" name="volley" level="project" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/app/src/main/java/com/camilstaps/taize/Taize.java b/app/src/main/java/com/camilstaps/taize/Taize.java index 692ecc2..031575b 100644 --- a/app/src/main/java/com/camilstaps/taize/Taize.java +++ b/app/src/main/java/com/camilstaps/taize/Taize.java @@ -284,6 +284,8 @@ public class Taize { * Get the podcasts * @param context * @param listener + * + * @todo now that Taizé uses "Dom Radio" as title, we can't search for dates in the title anymore... */ public static void getPodcasts(final Context context, final Listener<List<Podcast>> listener) { |