Merge pull request #9 from tuarua/development

Development
tuarua · Mar 6, 2020 · d929189 · d929189
2 parents 51e4736 + da1a79b
commit d929189
Show file tree

Hide file tree

Showing 31 changed files with 131 additions and 149 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.3.0
+- Updated to FreSwift 4.3.0
+
 ### 1.2.0
 - Added is Desktop example
 

diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ Open */example-desktop/packaging/sign.sh* and modify the values at the top of th
 
 Copy your .provisionprofile into */example-desktop/packaging* and rename as *MacDeveloper.provisionprofile*
 
-From the command line cd into */example-desktop/packaging* and run:
+From Terminal cd into */example-desktop/packaging* and run:
 
 ```shell
 bash sign.sh
@@ -105,4 +105,4 @@ bash sign_store.sh
 * IntelliJ IDEA
 * AIR 33.0.2.338+
 * Xcode 11.3
-* [wget](http://rudix.org/packages/wget.html) on macOS
+* wget on macOS via `brew install wget`
diff --git a/example-desktop/get_dependencies.sh b/example-desktop/get_dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-AneVersion="1.2.0"
-FreSwiftVersion="4.2.0"
+AneVersion="1.3.0"
+FreSwiftVersion="4.3.0"
 
 wget -O ../native_extension/ane/FreSwift.ane https://github.com/tuarua/Swift-IOS-ANE/releases/download/$FreSwiftVersion/FreSwift.ane?raw=true
 wget -O ../native_extension/ane/AppleSignInANE.ane https://github.com/tuarua/Apple-Signin-ANE/releases/download/$AneVersion/AppleSignInANE.ane?raw=true
diff --git a/example-desktop/src/AppIcon.icns b/example-desktop/src/AppIcon.icns
diff --git a/example-desktop/src/Assets.car b/example-desktop/src/Assets.car
diff --git a/example-desktop/src/Entitlements.entitlements b/example-desktop/src/Entitlements.entitlements
diff --git a/example-desktop/src/Main-app.xml b/example-desktop/src/Main-app.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.AppleSignInANE.ExampleMac</id>
     <filename>Main</filename>
     <name>Main</name>
-    <versionNumber>1.2.0</versionNumber>
+    <versionNumber>1.2.1</versionNumber>
 
     <!-- Identifies the ActionScript extensions used by an application. -->
     <extensions>

diff --git a/example-desktop/src/Main.as b/example-desktop/src/Main.as
@@ -1,12 +1,12 @@
 package {
 
-import com.tuarua.AppleSignInANE;
+import com.tuarua.AppleSignIn;
 import com.tuarua.FreSwift;
-import com.tuarua.applesigninane.AppleIDProviderCredentialState;
-import com.tuarua.applesigninane.AuthorizationErrorCode;
-import com.tuarua.applesigninane.AuthorizationScope;
-import com.tuarua.applesigninane.events.AppleSignInErrorEvent;
-import com.tuarua.applesigninane.events.AppleSignInEvent;
+import com.tuarua.applesignin.AppleIDProviderCredentialState;
+import com.tuarua.applesignin.AuthorizationErrorCode;
+import com.tuarua.applesignin.AuthorizationScope;
+import com.tuarua.applesignin.events.AppleSignInErrorEvent;
+import com.tuarua.applesignin.events.AppleSignInEvent;
 
 import flash.desktop.NativeApplication;
 import flash.display.Sprite;
@@ -24,7 +24,7 @@ import views.SimpleButton;
 [SWF(width="800", height="600", frameRate="60", backgroundColor="#FFFFFF")]
 public class Main extends Sprite {
     private var freSwiftANE:FreSwift = new FreSwift(); // must create before all others
-    private var appleSignIn:AppleSignInANE;
+    private var appleSignIn:AppleSignIn;
     public static const FONT:Font = new FiraSansSemiBold();
     private var statusLabel:TextField = new TextField();
 
@@ -62,61 +62,60 @@ public class Main extends Sprite {
         getCredentialStateBtn.x = (stage.stageWidth - getCredentialStateBtn.width) / 2;
         getCredentialStateBtn.y = signInBtn.y + 80;
 
-        appleSignIn = AppleSignInANE.appleSignIn;
-        if (appleSignIn.isSupported) {
-            appleSignIn.addEventListener(AppleSignInErrorEvent.ERROR, onError);
-            appleSignIn.addEventListener(AppleSignInEvent.SUCCESS, onSuccess);
-            addChild(signInBtn);
-            addChild(getCredentialStateBtn);
-        } else {
-            statusLabel.text = "Apple Sign In is only supported on MacOS 10.15+";
-        }
-
         statusLabel.y = getCredentialStateBtn.y + 80;
         addChild(statusLabel);
 
+        appleSignIn = AppleSignIn.shared();
+        if (!AppleSignIn.isSupported) {
+            statusLabel.text = "Apple Sign In is only supported on MacOS 10.15+";
+            return;
+        }
+
+        appleSignIn.addEventListener(AppleSignInErrorEvent.ERROR, onError);
+        appleSignIn.addEventListener(AppleSignInEvent.SUCCESS, onSuccess);
+        addChild(signInBtn);
+        addChild(getCredentialStateBtn);
     }
 
     private function onSignInClick(event:MouseEvent):void {
         appleSignIn.signIn(new <String>[AuthorizationScope.email, AuthorizationScope.fullName]);
     }
 
     private function onGetCredentialStateClick(event:MouseEvent):void {
-        appleSignIn.getCredentialState("x.x.x",
-                function (state:int, error:Error = null):void {
-                    if (error) {
-                        statusLabel.text = "Credential Error: " + error.message + "\nReason: ";
-                        switch (error.errorID) {
-                            case AuthorizationErrorCode.unknown:
-                                statusLabel.text += "Unknown";
-                                break;
-                            case AuthorizationErrorCode.canceled:
-                                statusLabel.text += "Cancelled";
-                                break;
-                            case AuthorizationErrorCode.failed:
-                                statusLabel.text += "Failed";
-                                break;
-                            case AuthorizationErrorCode.invalidResponse:
-                                statusLabel.text += "Invalid Response";
-                                break;
-                            case AuthorizationErrorCode.notHandled:
-                                statusLabel.text += "Not handled";
-                                break;
-                        }
-                        return;
-                    }
-                    switch (state) {
-                        case AppleIDProviderCredentialState.authorized:
-                            statusLabel.text = "Credential: Authorized";
-                            break;
-                        case AppleIDProviderCredentialState.notFound:
-                            statusLabel.text = "Credential: Not Found";
-                            break;
-                        case AppleIDProviderCredentialState.revoked:
-                            statusLabel.text = "Credential: Revoked";
-                            break;
-                    }
-                });
+        appleSignIn.getCredentialState("x.x.x", function (state:int, error:Error = null):void {
+            if (error) {
+                statusLabel.text = "Credential Error: " + error.message + "\nReason: ";
+                switch (error.errorID) {
+                    case AuthorizationErrorCode.unknown:
+                        statusLabel.text += "Unknown";
+                        break;
+                    case AuthorizationErrorCode.canceled:
+                        statusLabel.text += "Cancelled";
+                        break;
+                    case AuthorizationErrorCode.failed:
+                        statusLabel.text += "Failed";
+                        break;
+                    case AuthorizationErrorCode.invalidResponse:
+                        statusLabel.text += "Invalid Response";
+                        break;
+                    case AuthorizationErrorCode.notHandled:
+                        statusLabel.text += "Not handled";
+                        break;
+                }
+                return;
+            }
+            switch (state) {
+                case AppleIDProviderCredentialState.authorized:
+                    statusLabel.text = "Credential: Authorized";
+                    break;
+                case AppleIDProviderCredentialState.notFound:
+                    statusLabel.text = "Credential: Not Found";
+                    break;
+                case AppleIDProviderCredentialState.revoked:
+                    statusLabel.text = "Credential: Revoked";
+                    break;
+            }
+        });
     }
 
     private function onSuccess(event:AppleSignInEvent):void {
@@ -152,8 +151,8 @@ public class Main extends Sprite {
     }
 
     private function onExiting(event:Event):void {
-        freSwiftANE.dispose();
-        AppleSignInANE.dispose();
+        FreSwift.dispose();
+        AppleSignIn.dispose();
     }
 }
 }
diff --git a/example-mobile/get_ios_dependencies.sh b/example-mobile/get_ios_dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-AneVersion="1.2.0"
-FreSwiftVersion="4.2.0"
+AneVersion="1.3.0"
+FreSwiftVersion="4.3.0"
 
 rm -r ios_dependencies/device
 rm -r ios_dependencies/simulator

diff --git a/example-mobile/src/StarlingRoot.as b/example-mobile/src/StarlingRoot.as
@@ -1,12 +1,12 @@
 package {
-import com.tuarua.AppleSignInANE;
-import com.tuarua.applesigninane.AppleIDCredential;
-import com.tuarua.applesigninane.AppleIDProviderCredentialState;
-import com.tuarua.applesigninane.AuthorizationErrorCode;
-import com.tuarua.applesigninane.AuthorizationScope;
-import com.tuarua.applesigninane.UserDetectionStatus;
-import com.tuarua.applesigninane.events.AppleSignInErrorEvent;
-import com.tuarua.applesigninane.events.AppleSignInEvent;
+import com.tuarua.AppleSignIn;
+import com.tuarua.applesignin.AppleIDCredential;
+import com.tuarua.applesignin.AppleIDProviderCredentialState;
+import com.tuarua.applesignin.AuthorizationErrorCode;
+import com.tuarua.applesignin.AuthorizationScope;
+import com.tuarua.applesignin.UserDetectionStatus;
+import com.tuarua.applesignin.events.AppleSignInErrorEvent;
+import com.tuarua.applesignin.events.AppleSignInEvent;
 
 import flash.desktop.NativeApplication;
 import flash.events.Event;
@@ -25,7 +25,7 @@ public class StarlingRoot extends Sprite {
     private var getCredentialStateBtn:SimpleButton = new SimpleButton("Get Credential State");
 
     private var statusLabel:TextField;
-    private var appleSignIn:AppleSignInANE;
+    private var appleSignIn:AppleSignIn;
 
     public function StarlingRoot() {
         super();
@@ -34,8 +34,8 @@ public class StarlingRoot extends Sprite {
     }
 
     public function start():void {
-        appleSignIn = AppleSignInANE.appleSignIn;
-        if (!appleSignIn.isSupported) return;
+        appleSignIn = AppleSignIn.shared();
+        if (!AppleSignIn.isSupported) return;
         appleSignIn.addEventListener(AppleSignInErrorEvent.ERROR, onError);
         appleSignIn.addEventListener(AppleSignInEvent.SUCCESS, onSuccess);
         initMenu();
@@ -154,7 +154,7 @@ public class StarlingRoot extends Sprite {
     }
 
     private function onExiting(event:Event):void {
-        AppleSignInANE.dispose();
+        AppleSignIn.dispose();
     }
 
 

diff --git a/example-tvos/get_tvos_dependencies.sh b/example-tvos/get_tvos_dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-AneVersion="1.2.0"
-FreSwiftVersion="4.2.0"
+AneVersion="1.3.0"
+FreSwiftVersion="4.3.0"
 
 rm -r tvos_dependencies/device
 rm -r tvos_dependencies/simulator

diff --git a/native_extension/ane/docs/com.tuarua.applesignin.events.xml b/native_extension/ane/docs/com.tuarua.applesignin.events.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><apiPackage id="com.tuarua.applesignin.events"><apiName>com.tuarua.applesignin.events</apiName><apiDetail/><apiClassifier id="com.tuarua.applesignin.events:AppleSignInEvent"><apiName>AppleSignInEvent</apiName><shortdesc/><prolog><asMetadata/></prolog><apiClassifierDetail><apiClassifierDef><apiAccess value="public"/><apiStatic/><apiBaseClassifier>flash.events:Event</apiBaseClassifier></apiClassifierDef></apiClassifierDetail><apiOperation id="com.tuarua.applesignin.events:AppleSignInEvent:clone"><apiName>clone</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="flash.events:Event"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiOperation id="com.tuarua.applesignin.events:AppleSignInEvent:toString"><apiName>toString</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="String"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiValue id="com.tuarua.applesignin.events:AppleSignInEvent:SUCCESS"><apiName>SUCCESS</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiAccess value="public"/><apiStatic/><apiData>AppleSignInANE.OnSuccess</apiData><apiType value="String"/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.applesignin.events:AppleSignInEvent:appleIDCredential"><apiName>appleIDCredential</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiValueClassifier>com.tuarua.applesignin:AppleIDCredential</apiValueClassifier></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.applesignin.events:AppleSignInEvent:passwordCredential"><apiName>passwordCredential</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiValueClassifier>com.tuarua.applesignin:PasswordCredential</apiValueClassifier></apiValueDef></apiValueDetail></apiValue></apiClassifier><apiClassifier id="com.tuarua.applesignin.events:AppleSignInErrorEvent"><apiName>AppleSignInErrorEvent</apiName><shortdesc/><prolog><asMetadata/></prolog><apiClassifierDetail><apiClassifierDef><apiAccess value="public"/><apiStatic/><apiBaseClassifier>flash.events:Event</apiBaseClassifier></apiClassifierDef></apiClassifierDetail><apiOperation id="com.tuarua.applesignin.events:AppleSignInErrorEvent:clone"><apiName>clone</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="flash.events:Event"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiOperation id="com.tuarua.applesignin.events:AppleSignInErrorEvent:toString"><apiName>toString</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="String"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiValue id="com.tuarua.applesignin.events:AppleSignInErrorEvent:ERROR"><apiName>ERROR</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiAccess value="public"/><apiStatic/><apiData>AppleSignInANE.OnError</apiData><apiType value="String"/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.applesignin.events:AppleSignInErrorEvent:error"><apiName>error</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="Error"/></apiValueDef></apiValueDetail></apiValue></apiClassifier></apiPackage>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?xml version="1.0" encoding="UTF-8"?><apiPackage id="com.tuarua.applesignin.events"><apiName>com.tuarua.applesignin.events</apiName><apiDetail/><apiClassifier id="com.tuarua.applesignin.events:AppleSignInEvent"><apiName>AppleSignInEvent</apiName><shortdesc/><prolog><asMetadata/></prolog><apiClassifierDetail><apiClassifierDef><apiAccess value="public"/><apiStatic/><apiBaseClassifier>flash.events:Event</apiBaseClassifier></apiClassifierDef></apiClassifierDetail><apiOperation id="com.tuarua.applesignin.events:AppleSignInEvent:clone"><apiName>clone</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="flash.events:Event"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiOperation id="com.tuarua.applesignin.events:AppleSignInEvent:toString"><apiName>toString</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="String"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiValue id="com.tuarua.applesignin.events:AppleSignInEvent:SUCCESS"><apiName>SUCCESS</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiAccess value="public"/><apiStatic/><apiData>AppleSignInANE.OnSuccess</apiData><apiType value="String"/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.applesignin.events:AppleSignInEvent:appleIDCredential"><apiName>appleIDCredential</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiValueClassifier>com.tuarua.applesignin:AppleIDCredential</apiValueClassifier></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.applesignin.events:AppleSignInEvent:passwordCredential"><apiName>passwordCredential</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiValueClassifier>com.tuarua.applesignin:PasswordCredential</apiValueClassifier></apiValueDef></apiValueDetail></apiValue></apiClassifier><apiClassifier id="com.tuarua.applesignin.events:AppleSignInErrorEvent"><apiName>AppleSignInErrorEvent</apiName><shortdesc/><prolog><asMetadata/></prolog><apiClassifierDetail><apiClassifierDef><apiAccess value="public"/><apiStatic/><apiBaseClassifier>flash.events:Event</apiBaseClassifier></apiClassifierDef></apiClassifierDetail><apiOperation id="com.tuarua.applesignin.events:AppleSignInErrorEvent:clone"><apiName>clone</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="flash.events:Event"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiOperation id="com.tuarua.applesignin.events:AppleSignInErrorEvent:toString"><apiName>toString</apiName><shortdesc/><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiIsOverride/><apiReturn><apiType value="String"/></apiReturn></apiOperationDef></apiOperationDetail></apiOperation><apiValue id="com.tuarua.applesignin.events:AppleSignInErrorEvent:ERROR"><apiName>ERROR</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiAccess value="public"/><apiStatic/><apiData>AppleSignInANE.OnError</apiData><apiType value="String"/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.applesignin.events:AppleSignInErrorEvent:error"><apiName>error</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="Error"/></apiValueDef></apiValueDetail></apiValue></apiClassifier></apiPackage>