Merge pull request #18 from e-mission/pull_from_master

Upgrade the devapp to the most recent version of everything

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="47" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="45" version="3.2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="48" id="edu.berkeley.eecs.emission.devapp" ios-CFBundleVersion="46" version="3.2.5" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>em-devapp</name>
     <description>
         The emission Developer app is a clone of the PhoneGap Developer app with the emission plugins. It is a testing utility for web developers and designers using the emission platform. After installing this app on your device or simulator you will be able to use phonegap serve to autorefresh without re-deploying the app everytime.
@@ -48,8 +48,8 @@
         <preference name="WKWebViewOnly" value="true" />
         <preference name="WKSuspendInBackground" value="false" />
         <preference name="AutoHideSplashScreen" value="true" />
-        <config-file file="*-Info.plist" mode="merge" target="NSCameraUsageDescription">
-            <string>To scan the barcode for the study</string>
+        <config-file parent="NSCameraUsageDescription" target="*-Info.plist" mode="merge">
+            <string>To scan QR codes for the login token and the study</string>
         </config-file>
         <icon height="167" src="resources/icon/ios/icon-83.5@2x.png" width="167" />
         <icon height="76" src="resources/icon/ios/icon-76.png" width="76" />
@@ -82,11 +82,16 @@
         <splash height="1242" src="resources/splash/ios/Default-Landscape-736h.png" width="2208" />
     </platform>
     <platform name="android">
-        <preference name="android-minSdkVersion" value="22" />
-        <preference name="android-targetSdkVersion" value="30" />
+
+        <preference name="android-minSdkVersion" value="23" />
+        <preference name="android-targetSdkVersion" value="32" />
+        <preference name="AndroidLaunchMode" value="singleInstance"/>
         <preference name="AndroidXEnabled" value="true" />
+        <preference name="GradlePluginKotlinEnabled" value="true" />
+        <preference name="GradlePluginKotlinVersion" value="1.7.10" />
         <resource-file src="google-services.json" target="app/google-services.json" />
-        <!-- <hook src="hooks/before_build/android/android_set_provider.js" type="before_build" /> -->
+        <hook src="hooks/before_build/android/android_set_provider.js" type="before_build" />
+        <hook src="hooks/before_build/android/android_change_compile_implementation.js" type="before_build" />
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <uses-library android:name="org.apache.http.legacy" android:required="false" />
         </config-file>