Merge pull request #49 from tuarua/development

Development
tuarua · Dec 30, 2020 · 780d3a7 · 780d3a7
2 parents 6f5124d + b371a92
commit 780d3a7
Show file tree

Hide file tree

Showing 460 changed files with 1,000 additions and 17,660 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+### 0.16.0
+- Upgraded to AIR 33.1.1.345
+- AND: Updated to FreKotlin 1.42.0
+- iOS: Updated to FreSwift 5.1.0
+- iOS: Firebase 7.3.0
+- iOS: OneSignal 2.16.1
+- iOS: OneSignal strip out unneeded archs
+- iOS: minVersion is now 10.0
+- AND: Analytics 18.0.0
+- AND: Crashlytics 17.3.0
+- AND: Firestore 22.0.1
+- AND: Remote Config 20.0.2
+- AND: Auth 20.0.1
+- AND: Play Services Auth 19.0.0
+- AND: Performance 19.0.11
+- AND: Messaging 21.0.1
+- AND: Dynamic Links 19.1.1
+- AND: ModelInterpreter 22.0.4
+- AND: Vision 24.1.0
+- [RemoteConfig] remove `RemoteConfig.activateFetched`
+- [RemoteConfig] remove `RemoteConfigSettings.developerModeEnabled`
+
 ### 0.15.0
 - AND: Updated to FreKotlin 1.41.0
 - iOS: Updated to FreSwift 5.0.0

diff --git a/example/.gitignore b/example/.gitignore
@@ -8,6 +8,7 @@ bin-release/
 bin-release-temp/
 cache/
 android_dependencies_bak/
+extensions_http/
 
 *.app
 

diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml
diff --git a/example/FirebaseANESample-mobile.iml b/example/FirebaseANESample-mobile.iml
@@ -12,7 +12,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -44,7 +44,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -72,7 +72,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/GoogleSignIn.bundle" path-in-package="GoogleSignIn.bundle" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/gRPCCertificates-Cpp.bundle" path-in-package="gRPCCertificates-Cpp.bundle" />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning_Firebase.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning_Firebase.mobileprovision" />
         </packaging-ios>
       </configuration>
       <configuration name="iOS Store" target-platform="Mobile" pure-as="true" main-class="Main" output-file="iOS_Store.swf" output-folder="$MODULE_DIR$/bin-release">
@@ -85,7 +85,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -123,9 +123,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.300" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.345" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="ZipANE" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin" level="project" />
     <orderEntry type="library" exported="" name="com.google.code.gson.gson-2.8.1" level="project" />
@@ -254,6 +253,7 @@
     <orderEntry type="library" exported="" name="com.google.firebase.firebase-auth-19.3.2" level="project" />
     <orderEntry type="library" exported="" name="com.squareup.okhttp3.okhttp-3.12.1" level="project" />
     <orderEntry type="library" exported="" name="android_dependencies" level="project" />
+    <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="extensions" level="project" />
   </component>
 </module>
diff --git a/example/air_package.json b/example/air_package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase-sample",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "appDescriptor": "src/Main-app.xml",
   "variables": {
     "firebase_associated_domain": "xxxx.app.goo.gl",
@@ -15,17 +15,17 @@
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.firebase.FirebaseANE": "0.15.0",
-    "com.tuarua.firebase.AnalyticsANE": "0.15.0",
-    "com.tuarua.firebase.AuthANE": "0.15.0",
-    "com.tuarua.firebase.DynamicLinksANE": "0.15.0",
-    "com.tuarua.firebase.FirestoreANE": "0.15.0",
-    "com.tuarua.firebase.MessagingANE": "0.15.0",
-    "com.tuarua.firebase.PerformanceANE": "0.15.0",
-    "com.tuarua.firebase.RemoteConfigANE": "0.15.0",
-    "com.tuarua.firebase.StorageANE": "0.15.0",
-    "com.tuarua.firebase.CrashlyticsANE": "0.15.0",
-    "com.tuarua.google.GoogleSignInANE": "0.15.0",
-    "com.tuarua.OneSignalANE": "0.15.0"
+    "com.tuarua.firebase.FirebaseANE": "0.16.0",
+    "com.tuarua.firebase.AnalyticsANE": "0.16.0",
+    "com.tuarua.firebase.AuthANE": "0.16.0",
+    "com.tuarua.firebase.DynamicLinksANE": "0.16.0",
+    "com.tuarua.firebase.FirestoreANE": "0.16.0",
+    "com.tuarua.firebase.MessagingANE": "0.16.0",
+    "com.tuarua.firebase.PerformanceANE": "0.16.0",
+    "com.tuarua.firebase.RemoteConfigANE": "0.16.0",
+    "com.tuarua.firebase.StorageANE": "0.16.0",
+    "com.tuarua.firebase.CrashlyticsANE": "0.16.0",
+    "com.tuarua.google.GoogleSignInANE": "0.16.0",
+    "com.tuarua.OneSignalANE": "0.16.0"
   }
 }
diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <application xmlns="http://ns.adobe.com/air/application/33.1">
   <id>com.tuarua.firebaseane.example</id>
   <filename>FireBaseExample</filename>
   <name>FIR-Example</name>
-  <versionNumber>0.15.0</versionNumber>
+  <versionNumber>0.16.0</versionNumber>
   <!-- Settings for the application's initial window. Required. -->
   <initialWindow>
     <content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
@@ -69,6 +69,7 @@
 	<!-- Required by older versions of Google Play services to create IID tokens -->
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 	<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
+	<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
 	<!-- Create a unique permission for your app and use it so only your app can receive your OneSignal messages. -->
 	<permission android:name="air.com.tuarua.firebaseane.example.permission.C2D_MESSAGE" android:protectionLevel="signature" />
 	<uses-permission android:name="air.com.tuarua.firebaseane.example.permission.C2D_MESSAGE" />
@@ -120,12 +121,17 @@
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.analytics.connector.internal.AnalyticsConnectorRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.analytics.ktx.FirebaseAnalyticsKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
+			<!--
+                This registrar is not defined in the dynamic-module-support sdk itself to allow non-firebase
+                clients to use it as well, by defining this registrar in their own core/common library.
+            -->
+			<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamicloading.DynamicLoadingRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.auth.ktx.FirebaseAuthKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
-			<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.ktx.FirebaseDynamicLinksRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
+			<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.ktx.FirebaseDynamicLinksKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.firestore.ktx.FirebaseFirestoreKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
 			<meta-data android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar" android:value="com.google.firebase.components.ComponentRegistrar" />
@@ -155,7 +161,28 @@
 		</service>
 		<service android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"></service>
 		<receiver android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver" android:exported="false" />
-		<activity android:name="com.google.firebase.auth.internal.FederatedSignInActivity" android:excludeFromRecents="true" android:exported="true" android:launchMode="singleTask" android:permission="com.google.firebase.auth.api.gms.permission.LAUNCH_FEDERATED_SIGN_IN" android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+		<activity android:name="com.google.firebase.auth.internal.GenericIdpActivity" android:excludeFromRecents="true" android:exported="true" android:launchMode="singleTask" android:theme="@android:style/Theme.Translucent.NoTitleBar">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:host="firebase.auth" android:path="/" android:scheme="genericidp" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.google.firebase.auth.internal.RecaptchaActivity" android:excludeFromRecents="true" android:exported="true" android:launchMode="singleTask" android:theme="@android:style/Theme.Translucent.NoTitleBar">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:host="firebase.auth" android:path="/" android:scheme="recaptcha" />
+			</intent-filter>
+		</activity>
+		<service android:name="com.google.firebase.auth.api.fallback.service.FirebaseAuthFallbackService" android:enabled="true" android:exported="false">
+			<intent-filter>
+				<action android:name="com.google.firebase.auth.api.gms.service.START" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</service>
 		<!--
              FirebaseMessagingService performs security checks at runtime,
              but set to not exported to explicitly avoid allowing another app to call it.

diff --git a/example/src/views/examples/AuthExample.as b/example/src/views/examples/AuthExample.as
@@ -183,7 +183,7 @@ public class AuthExample extends Sprite implements IExample {
             statusLabel.text = "onSignedIn error: " + error.errorID + " : " + error.message;
             return;
         }
-        trace(result.additionalUserInfo);
+        trace(JSON.stringify(result.additionalUserInfo));
         var user:FirebaseUser = result.user;
         statusLabel.text = "Signed In" + "\n" +
                 "isAnonymous: " + user.isAnonymous + "\n" +

diff --git a/example/src/views/examples/CrashlyticsExample.as b/example/src/views/examples/CrashlyticsExample.as
@@ -29,10 +29,9 @@ public class CrashlyticsExample extends Sprite implements IExample {
 
     private function initMenu():void {
         statusLabel = new TextField(stageWidth - 100, 1400, "");
-        statusLabel.format.setTo(Fonts.NAME, 13, 0x222222, Align.LEFT, Align.TOP);
+        statusLabel.format.setTo(Fonts.NAME, 13, 0x222222, Align.CENTER, Align.TOP);
         statusLabel.wordWrap = true;
         statusLabel.touchable = false;
-        statusLabel.x = 50;
 
         addChild(statusLabel);
 

diff --git a/example/src/views/examples/OneSignalExample.as b/example/src/views/examples/OneSignalExample.as
@@ -51,7 +51,7 @@ public class OneSignalExample extends Sprite implements IExample {
 
 
         statusLabel = new TextField(stageWidth, 1400, "");
-        statusLabel.format.setTo(Fonts.NAME, 13, 0x222222, Align.LEFT, Align.TOP);
+        statusLabel.format.setTo(Fonts.NAME, 13, 0x222222, Align.CENTER, Align.TOP);
         statusLabel.touchable = false;
         statusLabel.y = btnSetEmail.y + (StarlingRoot.GAP * 1.25);
         addChild(statusLabel);

diff --git a/example/src/views/examples/RemoteConfigExample.as b/example/src/views/examples/RemoteConfigExample.as
@@ -30,7 +30,7 @@ public class RemoteConfigExample extends Sprite implements IExample {
         if (isInited) return;
 
         remoteConfig = Firebase.remoteConfig();
-        remoteConfig.configSettings = new RemoteConfigSettings(true);
+        remoteConfig.configSettings = new RemoteConfigSettings();
         remoteConfig.addEventListener(RemoteConfigEvent.FETCH, onRemoteConfig);
         remoteConfig.setDefaults(
                 {
@@ -69,12 +69,11 @@ public class RemoteConfigExample extends Sprite implements IExample {
     private function onGetWelcomeMessageClick(event:TouchEvent):void {
         var touch:Touch = event.getTouch(btnGetWelcomeMessage);
         if (touch != null && touch.phase == TouchPhase.ENDED) {
-            remoteConfig.fetch(0);
+            remoteConfig.fetchAndActivate();
         }
     }
 
     private function onRemoteConfig(event:RemoteConfigEvent):void {
-        remoteConfig.activateFetched();
         var message:String = remoteConfig.getString("welcome_message");
         if (remoteConfig.getBoolean("welcome_message_caps")) {
             message = message.toUpperCase();

diff --git a/example_vision/.gitignore b/example_vision/.gitignore
@@ -79,3 +79,4 @@ fabric.properties
 # .idea/misc.xml
 # *.ipr
 /air_package.resolved.json
+google-services.json
diff --git a/example_vision/.idea/misc.xml b/example_vision/.idea/misc.xml
diff --git a/example_vision/VisionANESample.iml b/example_vision/VisionANESample.iml
@@ -12,7 +12,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <option name="additionalOptions" value="-advanced-telemetry -swf-version=42" />
@@ -27,7 +27,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/GoogleService-Info.plist" path-in-package="GoogleService-Info.plist" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets/mobilenet" path-in-package="mobilenet" />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning_Firebase.mobileprovision" />
         </packaging-ios>
       </configuration>
       <configuration name="Android Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="Android_Device.swf" output-folder="$MODULE_DIR$/bin-release">
@@ -40,7 +40,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <option name="additionalOptions" value="-advanced-telemetry" />
@@ -67,9 +67,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.300" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.345" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="FirebaseANE" level="project" />
     <orderEntry type="library" exported="" name="VisionANE" level="project" />
     <orderEntry type="library" exported="" name="VisionBarcodeANE" level="project" />
@@ -149,7 +148,8 @@
     <orderEntry type="library" exported="" name="com.google.firebase.firebase-ml-model-interpreter-22.0.3" level="project" />
     <orderEntry type="library" exported="" name="com.google.mlkit.image-labeling-16.2.0" level="project" />
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-measurement-17.4.4" level="project" />
-    <orderEntry type="library" exported="" name="extensions" level="project" />
     <orderEntry type="library" exported="" name="android_dependencies" level="project" />
+    <orderEntry type="library" exported="" name="starling" level="project" />
+    <orderEntry type="library" exported="" name="extensions" level="project" />
   </component>
 </module>
diff --git a/example_vision/air_package.json b/example_vision/air_package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase-sample",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "appDescriptor": "src/Main-app.xml",
   "variables": {},
   "airDotPrefix": true,
@@ -9,13 +9,13 @@
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.firebase.FirebaseANE": "0.15.0",
-    "com.tuarua.firebase.AnalyticsANE": "0.15.0",
-    "com.tuarua.firebase.VisionANE": "0.15.0",
-    "com.tuarua.firebase.VisionCloudTextANE": "0.15.0",
-    "com.tuarua.firebase.VisionCloudDocumentANE": "0.15.0",
-    "com.tuarua.firebase.VisionCloudLabelANE": "0.15.0",
-    "com.tuarua.firebase.VisionLandmarkANE": "0.15.0",
-    "com.tuarua.firebase.ModelInterpreterANE": "0.15.0"
+    "com.tuarua.firebase.FirebaseANE": "0.16.0",
+    "com.tuarua.firebase.AnalyticsANE": "0.16.0",
+    "com.tuarua.firebase.VisionANE": "0.16.0",
+    "com.tuarua.firebase.VisionCloudTextANE": "0.16.0",
+    "com.tuarua.firebase.VisionCloudDocumentANE": "0.16.0",
+    "com.tuarua.firebase.VisionCloudLabelANE": "0.16.0",
+    "com.tuarua.firebase.VisionLandmarkANE": "0.16.0",
+    "com.tuarua.firebase.ModelInterpreterANE": "0.16.0"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ bin-release/ @@
     bin-release-temp/
     cache/
     android_dependencies_bak/
+    extensions_http/
     *.app
@@ Expand Down @@