Bumped versionCode for next RC build

Android/.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

Android/app/app.iml

@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
       </configuration>
     </facet>
     <facet type="android" name="Android">

Android/app/build.gradle

@@ -46,8 +46,8 @@ android {
         applicationId "org.deadc0de.apple2ix.basic"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 25
+        versionCode 26
-        versionName "2.1.0-RC2"
+        versionName "2.1.0-RC3"
         ndk {
             moduleName "apple2ix"
         }

Android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

src/test/testcpu.c

@@ -1799,7 +1799,10 @@ TEST test_IRQ(void) {
     testcpu_set_opcode1(0xea/*NOP*/); // Implementation NOTE: not executed. IRQ is handled and one BIT instruction at C3FA location is executed
 
     cpu65_interrupt(IRQGeneric);
+
+    // These must match what iie_c3rom_peripheral():
     run_args.softswitches |= SS_C3ROM;
+    run_args.base_c3rom = apple_ii_64k[1];
 
     ASSERT(apple_ii_64k[0][0x1ff] != 0x1f);
     ASSERT(apple_ii_64k[0][0x1fe] != TEST_LOC_LO+1);
@@ -1829,7 +1832,12 @@ TEST test_IRQ(void) {
     ASSERT(run_args.cpu65_opcycles == 11); // 4 cycles BIT instruction + 7 cycles for IRQ handling
     ASSERT(run_args.cpu65_cycle_count == 11);
 
+    // These must match iie_c3rom_internal():
     run_args.softswitches &= ~SS_C3ROM;
+    extern void *iie_read_peripheral_card;
+    run_args.base_c3rom = (void *)iie_read_peripheral_card;
+    ASSERT(!(run_args.softswitches & SS_CXROM));
+
     cpu65_uninterrupt(IRQGeneric);
 
     PASS();

src/test/testdisk.c

@@ -1366,6 +1366,9 @@ TEST test_data_stability_po() {
     PASS();
 }
 
+#if MOBILE_DEVICE
+// This NIB image becomes actually gzipped and these tests blow up
+#else
 #define GZBAD_NIB "testgzheader.nib"
 #define GZBAD_NIB_LOAD_SHA1 "E25F3524F852EFD043E2A036DA36779F1F68A8A2"
 #define GZBAD_NIB_LOAD_SHA2 "A82BBF38F79FBFA072C1061661E316CA8AF3B950"
@@ -1406,6 +1409,7 @@ TEST test_disk_image_with_gzip_header_ro() {
 TEST test_disk_image_with_gzip_header_rw() {
     return _test_disk_image_with_gzip_header(/*readonly:*/0);
 }
+#endif
 
 #define GZINVALID_DSK "CorruptedGzipped.dsk.gz"
 static int _test_disk_invalid_gzipped(int readonly) {
@@ -1557,8 +1561,10 @@ GREATEST_SUITE(test_suite_disk) {
     RUN_TESTp(test_data_stability_nib);
     RUN_TESTp(test_data_stability_po);
 
+#if !MOBILE_DEVICE
     RUN_TESTp(test_disk_image_with_gzip_header_ro);
     RUN_TESTp(test_disk_image_with_gzip_header_rw);
+#endif
 
     RUN_TESTp(test_disk_invalid_gzipped_ro);
     RUN_TESTp(test_disk_invalid_gzipped_rw);