[#430] Crash Intel 64-bit Emulators

* [#430] App crashes on Intel x86_64 emulators

- Bump the SDK version to the latest snapshot version.
- Set app's max Android SDK version to 31 for wtf emulators.
- Remove overridden wtf emulators config from sdk-ext-lib module.

app/build.gradle.kts

@@ -267,12 +267,18 @@ emulatorwtf {
         buildMinSdk.coerceAtLeast(EMULATOR_WTF_MIN_SDK).toString()
     }
 
+    val targetSdkVersion = run {
+        @Suppress("MagicNumber", "PropertyName", "VariableNaming")
+        val EMULATOR_WTF_MAX_SDK = 31
+
+        val buildTargetSdk = project.properties["ANDROID_TARGET_SDK_VERSION"].toString().toInt()
+        buildTargetSdk.coerceAtMost(EMULATOR_WTF_MAX_SDK).toString()
+    }
+
     devices.set(
         listOf(
             mapOf("model" to "Pixel2", "version" to appMinSdkVersion),
-            // TODO [#430]: App won't run on API 31 Intel emulators
-            @Suppress("MagicNumber")
-            mapOf("model" to "Pixel2", "version" to 30)
+            mapOf("model" to "Pixel2", "version" to targetSdkVersion)
         )
     )
 }

gradle.properties

@@ -117,7 +117,7 @@ PLAY_CORE_KTX_VERSION=1.8.1
 ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0
 ZCASH_BIP39_VERSION=1.0.2
 # TODO [#279]: Revert to stable SDK before app release
-ZCASH_SDK_VERSION=1.5.0-beta01
+ZCASH_SDK_VERSION=1.6.0-beta01-SNAPSHOT
 ZXING_VERSION=3.5.0
 
 

sdk-ext-lib/build.gradle.kts

@@ -29,24 +29,3 @@ dependencies {
     }
 }
 
-// This block can eventually go away; it exists to override the max SDK version to avoid a JNI
-// crash https://github.com/zcash/secant-android-wallet/issues/430
-emulatorwtf {
-    // Emulator WTF has min and max values that might differ from our project's
-    // These are determined by `ew-cli --models`
-    @Suppress("MagicNumber", "PropertyName", "VariableNaming")
-    val EMULATOR_WTF_MIN_API = 23
-
-    val minSdkVersion = run {
-        val buildMinSdk = project.properties["ANDROID_LIB_MIN_SDK_VERSION"].toString().toInt()
-        buildMinSdk.coerceAtLeast(EMULATOR_WTF_MIN_API).toString()
-    }
-
-    devices.set(
-        listOf(
-            mapOf("model" to "Pixel2", "version" to minSdkVersion),
-            @Suppress("MagicNumber")
-            mapOf("model" to "Pixel2", "version" to 30)
-        )
-    )
-}