Merge pull request #36 from tuarua/development

2.4.0
tuarua · Nov 21, 2021 · 86f903d · 86f903d
2 parents da960ef + 168f3bf
commit 86f903d
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.4.0
+- Updated to FreSwift 5.5.1
+- Support Apple Silicon M1
+
 ### 2.3.0
 - macOS: Updated to FreSwift 5.2.0
 

diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml
diff --git a/example/DesktopToastANESample.iml b/example/DesktopToastANESample.iml
@@ -15,7 +15,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.575" />
+          <sdk name="AIRSDK_33.1.1.633" />
         </dependencies>
         <compiler-options>
           <map>
@@ -43,7 +43,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.575" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.633" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="DesktopToastANE" level="project" />
     <orderEntry type="library" exported="" name="CommonDependencies" level="project" />

diff --git a/example/air_package.json b/example/air_package.json
@@ -1,6 +1,6 @@
 {
   "name": "toast-sample",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "appDescriptor": "src/Main-app.xml",
   "variables": {
   },
@@ -10,6 +10,6 @@
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.DesktopToastANE": "2.3.0"
+    "com.tuarua.DesktopToastANE": "2.4.0"
   }
 }
diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml
@@ -4,7 +4,7 @@
   <!-- Used as the filename for the application. Required. -->
   <filename>DesktopToastANESample</filename>
   <name>DesktopToastANESample</name>
-  <versionNumber>2.3.0</versionNumber>
+  <versionNumber>2.4.0</versionNumber>
   <initialWindow>
     <!-- The main SWF or HTML file of the application. Required. -->
     <!-- Note: In Flash Builder, the SWF reference is set automatically. -->

diff --git a/native_extension/ane/air_package.json b/native_extension/ane/air_package.json
@@ -1,10 +1,10 @@
 {
   "name": "com.tuarua.DesktopToastANE",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "repository": {
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.FreSwift": "5.2.0"
+    "com.tuarua.FreSwift": "5.5.1"
   }
 }
diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh
@@ -8,7 +8,7 @@ echo $pathtome
 
 PROJECT_NAME=DesktopToastANE
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.476"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633"
 echo $AIR_SDK
 
 #Setup the directory.

diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.DesktopToastANE</id>
     <name>Desktop Toast ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-    <versionNumber>2.3.0</versionNumber>
+    <versionNumber>2.4.0</versionNumber>
 	<platforms>
         <platform name="Windows-x86-64">
             <applicationDeployment>

diff --git a/native_library/mac/DesktopToastANE/Cartfile b/native_library/mac/DesktopToastANE/Cartfile
@@ -1 +1 @@
-binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.2.0/FreSwift.json" ~> 5.2.0
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.5.1/FreSwift.json" ~> 5.5.1
diff --git a/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj b/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
 		90B843D323523F660009FB87 /* SwiftController+NSUserNotificationCenterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B843D223523F660009FB87 /* SwiftController+NSUserNotificationCenterDelegate.swift */; };
 		CE05BF0F1F657F120019899B /* FreMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = CE05BF0E1F657F120019899B /* FreMacros.h */; };
 		CE05BF111F657F1F0019899B /* FreSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE05BF101F657F1F0019899B /* FreSwift.framework */; };
-		CE36AF4D1DF47DBD003C224B /* Adobe AIR_64 in Frameworks */ = {isa = PBXBuildFile; fileRef = CE36AF4B1DF47DBD003C224B /* Adobe AIR_64 */; };
 		CE36AF4E1DF47DBD003C224B /* Adobe AIR in Frameworks */ = {isa = PBXBuildFile; fileRef = CE36AF4C1DF47DBD003C224B /* Adobe AIR */; };
 		CE36AF501DF47E4E003C224B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE36AF4F1DF47E4E003C224B /* Cocoa.framework */; };
 		CEE7AB121DF4D45D0047E083 /* SwiftController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE7AB111DF4D45D0047E083 /* SwiftController.swift */; };
@@ -28,8 +27,7 @@
 		CE05BF101F657F1F0019899B /* FreSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreSwift.framework; path = Carthage/Build/Mac/FreSwift.framework; sourceTree = "<group>"; };
 		CE36AF401DF47B7B003C224B /* DesktopToastANE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DesktopToastANE.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CE36AF441DF47B7C003C224B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		CE36AF4B1DF47DBD003C224B /* Adobe AIR_64 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR_64"; path = "/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR_64"; sourceTree = "<absolute>"; };
-		CE36AF4C1DF47DBD003C224B /* Adobe AIR */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR"; path = "/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR"; sourceTree = "<absolute>"; };
+		CE36AF4C1DF47DBD003C224B /* Adobe AIR */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR"; path = "/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR"; sourceTree = "<absolute>"; };
 		CE36AF4F1DF47E4E003C224B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		CEE7AB111DF4D45D0047E083 /* SwiftController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -41,7 +39,6 @@
 			files = (
 				CE05BF111F657F1F0019899B /* FreSwift.framework in Frameworks */,
 				CE36AF4E1DF47DBD003C224B /* Adobe AIR in Frameworks */,
-				CE36AF4D1DF47DBD003C224B /* Adobe AIR_64 in Frameworks */,
 				CE36AF501DF47E4E003C224B /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -100,7 +97,6 @@
 			isa = PBXGroup;
 			children = (
 				CE05BF101F657F1F0019899B /* FreSwift.framework */,
-				CE36AF4B1DF47DBD003C224B /* Adobe AIR_64 */,
 				CE36AF4C1DF47DBD003C224B /* Adobe AIR */,
 				CE36AF4F1DF47E4E003C224B /* Cocoa.framework */,
 			);
@@ -147,7 +143,7 @@
 		CE36AF371DF47B7B003C224B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = "Tua Rua Ltd";
 				TargetAttributes = {
 					CE36AF3F1DF47B7B003C224B = {
@@ -223,7 +219,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = x86_64;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -288,7 +283,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = x86_64;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -347,7 +341,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CLANG_ENABLE_MODULES = YES;
@@ -359,17 +353,17 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
-					/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac,
+					/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac,
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				FRAMEWORK_VERSION = A;
 				HEADER_SEARCH_PATHS = ../../../includes;
 				INFOPLIST_FILE = DesktopToastANE/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
+				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 2.3.0;
+				MARKETING_VERSION = 2.4.0;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-weak_framework",
@@ -390,7 +384,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CLANG_ENABLE_MODULES = YES;
@@ -402,17 +396,17 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
-					/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac,
+					/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac,
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				FRAMEWORK_VERSION = A;
 				HEADER_SEARCH_PATHS = ../../../includes;
 				INFOPLIST_FILE = DesktopToastANE/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
+				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 2.3.0;
+				MARKETING_VERSION = 2.4.0;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-weak_framework",