update travis config

tonyofrancis · Jan 3, 2018 · b9cdff6 · b9cdff6
1 parent c6dbf83
commit b9cdff6
Show file tree

Hide file tree

Showing 50 changed files with 9 additions and 67 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,12 @@ before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
   - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
 
-install: ./gradlew clean assemble test connectedDebugAndroidTest --stacktrace
+script:
+    - ./gradlew clean assemble
+    - ./gradlew test --stacktrace --info
+    - ./gradlew fetch2:connectedAndroidTest -PdisablePreDex --stacktrace --info
+    - ./gradlew assembleAndroidTest --stacktrace --info
+
 
 # Emulator Management: Create, Start and Wait
 before_script:

diff --git a/README.md b/README.md
@@ -233,7 +233,7 @@ if necessary. See the Java docs for details.
 ```java
 implementation "com.tonyodev.fetch2downloaders:fetch2downloaders:2.0.0-RC1"
 ```
-Set the OkHttp Downloader for fetch to use.
+Set the OkHttp Downloader for Fetch to use.
 ```java
 final OkHttpClient okHttpClient = new OkHttpClient.Builder()
           .build();

diff --git a/circle.yml b/circle.yml
diff --git a/SampleApp/.gitignore → sampleApp/.gitignore b/SampleApp/.gitignore → sampleApp/.gitignore
diff --git a/SampleApp/build.gradle → sampleApp/build.gradle b/SampleApp/build.gradle → sampleApp/build.gradle
diff --git a/SampleApp/proguard-rules.pro → sampleApp/proguard-rules.pro b/SampleApp/proguard-rules.pro → sampleApp/proguard-rules.pro
diff --git a/...yodev/fetchapp/ExampleInstrumentedTest.kt → ...yodev/fetchapp/ExampleInstrumentedTest.kt b/...yodev/fetchapp/ExampleInstrumentedTest.kt → ...yodev/fetchapp/ExampleInstrumentedTest.kt
diff --git a/SampleApp/src/main/AndroidManifest.xml → sampleApp/src/main/AndroidManifest.xml b/SampleApp/src/main/AndroidManifest.xml → sampleApp/src/main/AndroidManifest.xml
diff --git a/...com/tonyodev/fetchapp/ActionListener.java → ...com/tonyodev/fetchapp/ActionListener.java b/...com/tonyodev/fetchapp/ActionListener.java → ...com/tonyodev/fetchapp/ActionListener.java
diff --git a/.../main/java/com/tonyodev/fetchapp/App.java → .../main/java/com/tonyodev/fetchapp/App.java b/.../main/java/com/tonyodev/fetchapp/App.java → .../main/java/com/tonyodev/fetchapp/App.java
diff --git a/...main/java/com/tonyodev/fetchapp/Data.java → ...main/java/com/tonyodev/fetchapp/Data.java b/...main/java/com/tonyodev/fetchapp/Data.java → ...main/java/com/tonyodev/fetchapp/Data.java
diff --git a/...nyodev/fetchapp/DownloadListActivity.java → ...nyodev/fetchapp/DownloadListActivity.java b/...nyodev/fetchapp/DownloadListActivity.java → ...nyodev/fetchapp/DownloadListActivity.java
diff --git a/.../fetchapp/FailedMultiEnqueueActivity.java → .../fetchapp/FailedMultiEnqueueActivity.java b/.../fetchapp/FailedMultiEnqueueActivity.java → .../fetchapp/FailedMultiEnqueueActivity.java
diff --git a/...va/com/tonyodev/fetchapp/FileAdapter.java → ...va/com/tonyodev/fetchapp/FileAdapter.java b/...va/com/tonyodev/fetchapp/FileAdapter.java → ...va/com/tonyodev/fetchapp/FileAdapter.java
diff --git a/...m/tonyodev/fetchapp/FragmentActivity.java → ...m/tonyodev/fetchapp/FragmentActivity.java b/...m/tonyodev/fetchapp/FragmentActivity.java → ...m/tonyodev/fetchapp/FragmentActivity.java
diff --git a/.../tonyodev/fetchapp/GameFilesActivity.java → .../tonyodev/fetchapp/GameFilesActivity.java b/.../tonyodev/fetchapp/GameFilesActivity.java → .../tonyodev/fetchapp/GameFilesActivity.java
diff --git a/...a/com/tonyodev/fetchapp/MainActivity.java → ...a/com/tonyodev/fetchapp/MainActivity.java b/...a/com/tonyodev/fetchapp/MainActivity.java → ...a/com/tonyodev/fetchapp/MainActivity.java
diff --git a/...m/tonyodev/fetchapp/ProgressFragment.java → ...m/tonyodev/fetchapp/ProgressFragment.java b/...m/tonyodev/fetchapp/ProgressFragment.java → ...m/tonyodev/fetchapp/ProgressFragment.java
diff --git a/...odev/fetchapp/SingleDownloadActivity.java → ...odev/fetchapp/SingleDownloadActivity.java b/...odev/fetchapp/SingleDownloadActivity.java → ...odev/fetchapp/SingleDownloadActivity.java
diff --git a/...ain/java/com/tonyodev/fetchapp/Utils.java → ...ain/java/com/tonyodev/fetchapp/Utils.java b/...ain/java/com/tonyodev/fetchapp/Utils.java → ...ain/java/com/tonyodev/fetchapp/Utils.java
diff --git a/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml b/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml
diff --git a/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml b/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml
diff --git a/...pp/src/main/res/drawable/progress_bar.xml → ...pp/src/main/res/drawable/progress_bar.xml b/...pp/src/main/res/drawable/progress_bar.xml → ...pp/src/main/res/drawable/progress_bar.xml
diff --git a/...ain/res/layout/activity_download_list.xml → ...ain/res/layout/activity_download_list.xml b/...ain/res/layout/activity_download_list.xml → ...ain/res/layout/activity_download_list.xml
diff --git a/...res/layout/activity_fragment_progress.xml → ...res/layout/activity_fragment_progress.xml b/...res/layout/activity_fragment_progress.xml → ...res/layout/activity_fragment_progress.xml
diff --git a/...c/main/res/layout/activity_game_files.xml → ...c/main/res/layout/activity_game_files.xml b/...c/main/res/layout/activity_game_files.xml → ...c/main/res/layout/activity_game_files.xml
diff --git a/...App/src/main/res/layout/activity_main.xml → ...App/src/main/res/layout/activity_main.xml b/...App/src/main/res/layout/activity_main.xml → ...App/src/main/res/layout/activity_main.xml
diff --git a/...ain/res/layout/activity_multi_enqueue.xml → ...ain/res/layout/activity_multi_enqueue.xml b/...ain/res/layout/activity_multi_enqueue.xml → ...ain/res/layout/activity_multi_enqueue.xml
diff --git a/...n/res/layout/activity_single_download.xml → ...n/res/layout/activity_single_download.xml b/...n/res/layout/activity_single_download.xml → ...n/res/layout/activity_single_download.xml
diff --git a/...App/src/main/res/layout/download_item.xml → ...App/src/main/res/layout/download_item.xml b/...App/src/main/res/layout/download_item.xml → ...App/src/main/res/layout/download_item.xml
diff --git a/...src/main/res/layout/fragment_progress.xml → ...src/main/res/layout/fragment_progress.xml b/...src/main/res/layout/fragment_progress.xml → ...src/main/res/layout/fragment_progress.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png b/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png b/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png b/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png b/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/SampleApp/src/main/res/values/colors.xml → sampleApp/src/main/res/values/colors.xml b/SampleApp/src/main/res/values/colors.xml → sampleApp/src/main/res/values/colors.xml
diff --git a/SampleApp/src/main/res/values/dimens.xml → sampleApp/src/main/res/values/dimens.xml b/SampleApp/src/main/res/values/dimens.xml → sampleApp/src/main/res/values/dimens.xml
diff --git a/SampleApp/src/main/res/values/strings.xml → sampleApp/src/main/res/values/strings.xml b/SampleApp/src/main/res/values/strings.xml → sampleApp/src/main/res/values/strings.xml
diff --git a/SampleApp/src/main/res/values/styles.xml → sampleApp/src/main/res/values/styles.xml b/SampleApp/src/main/res/values/styles.xml → sampleApp/src/main/res/values/styles.xml
diff --git a/.../com/tonyodev/fetchapp/ExampleUnitTest.kt → .../com/tonyodev/fetchapp/ExampleUnitTest.kt b/.../com/tonyodev/fetchapp/ExampleUnitTest.kt → .../com/tonyodev/fetchapp/ExampleUnitTest.kt
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':SampleApp', ":fetch2", ":fetch2rx", ":fetch2downloaders", ":fetchmigrator"
+include ':sampleApp', ":fetch2", ":fetch2rx", ":fetch2downloaders", ":fetchmigrator"