From 730a09880edff906a04275e55d347bcdf835bc4c Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Thu, 27 Aug 2015 21:41:04 -0700
Subject: [PATCH] Changes insisted upon by AndroidStudio after upgrade

---
 Android/.idea/.name                           |  2 +-
 Android/.idea/compiler.xml                    |  5 +-
 Android/.idea/encodings.xml                   |  5 --
 Android/.idea/gradle.xml                      |  2 +-
 .../inspectionProfiles/Project_Default.xml    | 11 ----
 .../inspectionProfiles/profiles_settings.xml  |  7 --
 Android/.idea/misc.xml                        | 65 +++++++++++--------
 Android/.idea/modules.xml                     |  3 +-
 Android/.idea/runConfigurations.xml           | 12 ++++
 Android/.idea/scopes/scope_settings.xml       |  5 --
 Android/.idea/vcs.xml                         |  2 +-
 Android/Android.iml                           |  6 +-
 Android/app/app.iml                           | 38 ++++++-----
 Android/app/build.gradle                      | 28 ++++----
 Android/build.gradle                          |  2 +-
 Android/gradle.properties                     | 20 ++++++
 16 files changed, 113 insertions(+), 100 deletions(-)
 delete mode 100644 Android/.idea/encodings.xml
 delete mode 100644 Android/.idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 Android/.idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 Android/.idea/runConfigurations.xml
 delete mode 100644 Android/.idea/scopes/scope_settings.xml
 create mode 100644 Android/gradle.properties

diff --git a/Android/.idea/.name b/Android/.idea/.name
index 4a1c23cb..1429c13e 100644
--- a/Android/.idea/.name
+++ b/Android/.idea/.name
@@ -1 +1 @@
-Apple2ix
\ No newline at end of file
+Android
\ No newline at end of file
diff --git a/Android/.idea/compiler.xml b/Android/.idea/compiler.xml
index 217af471..96cc43ef 100644
--- a/Android/.idea/compiler.xml
+++ b/Android/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
@@ -19,5 +19,4 @@
       </profile>
     </annotationProcessing>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Android/.idea/encodings.xml b/Android/.idea/encodings.xml
deleted file mode 100644
index e206d70d..00000000
--- a/Android/.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/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
index 3ec59556..0833b17c 100644
--- a/Android/.idea/gradle.xml
+++ b/Android/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
diff --git a/Android/.idea/inspectionProfiles/Project_Default.xml b/Android/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index c66df003..00000000
--- a/Android/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="false" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/Android/.idea/inspectionProfiles/profiles_settings.xml b/Android/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b312839..00000000
--- a/Android/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
index ff7c8da5..1a3eaffb 100644
--- a/Android/.idea/misc.xml
+++ b/Android/.idea/misc.xml
@@ -3,35 +3,44 @@
   <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">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" 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="Copyright.UI">
-        <settings>
-          <last-edited>deadc0de.org</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>Android API 21 Platform</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Android/.idea/modules.xml b/Android/.idea/modules.xml
index 28d7222e..983383f3 100644
--- a/Android/.idea/modules.xml
+++ b/Android/.idea/modules.xml
@@ -6,5 +6,4 @@
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Android/.idea/runConfigurations.xml b/Android/.idea/runConfigurations.xml
new file mode 100644
index 00000000..7f68460d
--- /dev/null
+++ b/Android/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Android/.idea/scopes/scope_settings.xml b/Android/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8..00000000
--- a/Android/.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/Android/.idea/vcs.xml b/Android/.idea/vcs.xml
index 6c0b8635..6564d52d 100644
--- a/Android/.idea/vcs.xml
+++ b/Android/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="" vcs="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Android/Android.iml b/Android/Android.iml
index e31e6386..3a188e20 100644
--- a/Android/Android.iml
+++ b/Android/Android.iml
@@ -8,14 +8,12 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 10 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Android/app/app.iml b/Android/app/app.iml
index 13009d40..b76951fe 100644
--- a/Android/app/app.iml
+++ b/Android/app/app.iml
@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDemoDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDemoDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDemoDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDemoDebugTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDemoDebugTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDemoDebugTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDemoDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDemoDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDemoDebugAndroidTestSources</task>
+          <task>generateDemoDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,9 +26,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/demo/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/demo/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/demo/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/demo/debug" isTestSource="false" generated="true" />
@@ -34,7 +36,7 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/demo/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/demo/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/demo/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/demo/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/demo/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/demoDebug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/demoDebug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/demoDebug/assets" type="java-resource" />
@@ -42,12 +44,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/demoDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/demoDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/demoDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/demo/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/demo/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/demo/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/demo/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/demo/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/demo/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/demo/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/demo/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/demo/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/demo/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/demo/assets" type="java-resource" />
@@ -90,6 +92,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -105,10 +109,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$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="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index 48675c18..0cafd843 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -1,19 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
-
-    defaultConfig {
-        applicationId "org.deadc0de.apple2ix"
-        minSdkVersion 10
-        targetSdkVersion 21
-        versionCode 1
-        versionName "0.9.1"
-        ndk {
-            moduleName "apple2ix"
-        }
-    }
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
     signingConfigs {
         release {
             storeFile file("release2.keystore")
@@ -33,6 +22,17 @@ android {
             jniDebuggable true
         }
     }
+
+    defaultConfig {
+        applicationId "org.deadc0de.apple2ix"
+        minSdkVersion 10
+        targetSdkVersion 23
+        versionCode 1
+        versionName "0.9.1"
+        ndk {
+            moduleName "apple2ix"
+        }
+    }
     productFlavors {
         demo {
             applicationId "org.deadc0de.apple2ix.demo"
@@ -47,5 +47,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:appcompat-v7:23.0.0'
 }
diff --git a/Android/build.gradle b/Android/build.gradle
index 6356aabd..1b7886d1 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Android/gradle.properties b/Android/gradle.properties
new file mode 100644
index 00000000..1fd964e9
--- /dev/null
+++ b/Android/gradle.properties
@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.useDeprecatedNdk=true