Got application working again after period of inactivity.

andrew749 · Feb 22, 2016 · a7e0289 · a7e0289
1 parent f8e6021
commit a7e0289
Show file tree

Hide file tree

Showing 33 changed files with 471 additions and 425 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/aFileDialog/aFileDialog.iml b/aFileDialog/aFileDialog.iml
@@ -12,10 +12,7 @@
  <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="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
  <afterSyncTasks>
- <task>generateDebugAndroidTestSources</task>
  <task>generateDebugSources</task>
  </afterSyncTasks>
  <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,7 +26,7 @@
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
  <output url="file:https://$MODULE_DIR$/build/intermediates/classes/debug" />
- <output-test url="file:https://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+ <output-test url="file:https://$MODULE_DIR$/build/intermediates/classes/test/debug" />
  <exclude-output />
  <content url="file:https://$MODULE_DIR$">
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -51,13 +48,27 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/res" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/rs" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -66,24 +77,17 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/blame" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex-cache" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jacoco" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/javaResources" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/libs" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jniLibs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/lint" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/ndk" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/pre-dexed" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/proguard" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/transforms" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/outputs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/tmp" />
  </content>

diff --git a/app/app.iml b/app/app.iml
@@ -12,10 +12,7 @@
  <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="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
  <afterSyncTasks>
- <task>generateDebugAndroidTestSources</task>
  <task>generateDebugSources</task>
  </afterSyncTasks>
  <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
  <output url="file:https://$MODULE_DIR$/build/intermediates/classes/debug" />
- <output-test url="file:https://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+ <output-test url="file:https://$MODULE_DIR$/build/intermediates/classes/test/debug" />
  <exclude-output />
  <content url="file:https://$MODULE_DIR$">
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,6 +47,13 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/res" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -64,59 +68,69 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/rs" isTestSource="true" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/assets" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/blame" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/builds" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex-cache" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.2.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.1.1/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex-instrumentation/1.0.1/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/22.2.0/jars" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.5.0/jars" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/7.5.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/palette-v7/23.1.1/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/8.4.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/8.4.0/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jacoco" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/javaResources" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/libs" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-classes" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/instant-run-support" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jniLibs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/ndk" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/pre-dexed" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/proguard" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/reload-dex" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/restart-dex" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/transforms" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/outputs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/tmp" />
  </content>
- <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+ <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
  <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" exported="" name="mediarouter-v7-22.2.0" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
  <orderEntry type="library" exported="" name="gson-2.1" level="project" />
  <orderEntry type="library" exported="" name="jsoup-1.7.3" level="project" />
- <orderEntry type="library" exported="" name="play-services-cast-7.5.0" level="project" />
+ <orderEntry type="library" exported="" name="palette-v7-23.1.1" level="project" />
  <orderEntry type="library" exported="" name="google-http-client-android-1.20.0" level="project" />
  <orderEntry type="library" exported="" name="google-api-client-gson-1.20.0" level="project" />
  <orderEntry type="library" exported="" name="google-api-client-1.20.0" level="project" />
- <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
  <orderEntry type="library" exported="" name="google-http-client-jackson2-1.20.0" level="project" />
- <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
- <orderEntry type="library" exported="" name="jackson-core-2.1.3" level="project" />
+ <orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
  <orderEntry type="library" exported="" name="google-api-client-android-1.20.0" level="project" />
- <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
+ <orderEntry type="library" exported="" name="jackson-core-2.1.3" level="project" />
  <orderEntry type="library" exported="" name="google-oauth-client-1.20.0" level="project" />
+ <orderEntry type="library" exported="" name="play-services-cast-8.4.0" level="project" />
  <orderEntry type="library" exported="" name="google-api-services-youtube-v3-rev135-1.20.0" level="project" />
+ <orderEntry type="library" exported="" name="mediarouter-v7-23.1.1" level="project" />
  <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
+ <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
  <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
  <orderEntry type="library" exported="" name="google-http-client-1.20.0" level="project" />
- <orderEntry type="library" exported="" name="support-v13-22.2.0" level="project" />
- <orderEntry type="library" exported="" name="play-services-base-7.5.0" level="project" />
  <orderEntry type="library" exported="" name="guava-jdk5-13.0" level="project" />
+ <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
+ <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
  <orderEntry type="library" exported="" name="google-http-client-gson-1.20.0" level="project" />
+ <orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
  <orderEntry type="module" module-name="aFileDialog" exported="" />
  <orderEntry type="module" module-name="library" exported="" />
  </component>

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'android'
 
 android {
- compileSdkVersion 21
- buildToolsVersion '22.0.1'
+ compileSdkVersion 23
+ buildToolsVersion '23.0.2'
  defaultConfig {
- minSdkVersion 14
- targetSdkVersion 19
- versionCode 18
+ minSdkVersion MIN_SDK
+ targetSdkVersion TARGET_SDK
  versionName '3.3'
  multiDexEnabled = true
  }
@@ -18,16 +17,14 @@ android {
 }
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile fileTree(include: ['*.jar'], dir: 'libs')
  compile files('libs/jsoup-1.7.3.jar')
- compile 'com.android.support:support-v4:22.+'
- compile 'com.android.support:support-v13:22.+'
- compile 'com.android.support:appcompat-v7:22.+'
- compile 'com.android.support:mediarouter-v7:22.+'
- compile 'com.google.android.gms:play-services-cast:7.5.+'
  compile project(':library')
  compile project(':aFileDialog')
  compile 'com.google.apis:google-api-services-youtube:v3-rev135-1.20.0'
  compile 'com.google.api-client:google-api-client-android:1.20.0'
  compile 'com.google.api-client:google-api-client-gson:1.20.0'
+ compile 'com.android.support:support-v4:23.1.1'
+ compile 'com.android.support:mediarouter-v7:23.1.1'
+ compile 'com.google.android.gms:play-services-cast:8.4.+'
 }