Merge pull request #34 from tuarua/development

2.2.0
tuarua · Dec 26, 2020 · 8603d37 · 8603d37
2 parents 0773b22 + 25946d1
commit 8603d37
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 2.2.0
+- macOS: Updated to FreSwift 5.1.0
+
 ### 2.1.0
 - macOS: Updated to FreSwift 5.0.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_32" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -43,14 +43,14 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_32" 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="FiraSansSemiBold" level="project" />
     <orderEntry type="library" exported="" name="DesktopToastANE" level="project" />
     <orderEntry type="library" exported="" name="CommonDependencies" level="project" />
     <orderEntry type="library" exported="" name="SwiftOSXANE" level="project" />
     <orderEntry type="library" exported="" name="FreSwift" level="project" />
+    <orderEntry type="library" exported="" name="starling" level="project" />
+    <orderEntry type="library" exported="" name="FiraSansSemiBold" 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": "toast-sample",
-  "version": "2.1.0",
+  "version": "2.2.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.1.0"
+    "com.tuarua.DesktopToastANE": "2.2.0"
   }
 }
diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<application xmlns="http://ns.adobe.com/air/application/32.0">
+<application xmlns="http://ns.adobe.com/air/application/33.1">
   <id>com.tuarua.desktoptoastanesample</id>
   <!-- Used as the filename for the application. Required. -->
   <filename>DesktopToastANESample</filename>
   <name>DesktopToastANESample</name>
-  <versionNumber>2.0.0</versionNumber>
+  <versionNumber>2.2.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.1.0",
+  "version": "2.2.0",
   "repository": {
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.FreSwift": "5.0.0"
+    "com.tuarua.FreSwift": "5.1.0"
   }
-}
+}
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_32"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
 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.1.0</versionNumber>
+    <versionNumber>2.2.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.0.0/FreSwift.json" ~> 5.0.0
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/FreSwift.json" ~> 5.1.0
diff --git a/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj b/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj
@@ -223,6 +223,7 @@
 			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";
@@ -287,6 +288,7 @@
 			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";
@@ -345,6 +347,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ARCHS = x86_64;
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CLANG_ENABLE_MODULES = YES;
@@ -356,17 +359,17 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
-					/Users/eoinlandy/SDKs/AIRSDK_30/runtimes/air/mac,
+					/Users/eoinlandy/SDKs/AIRSDK_32/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_30/runtimes/air/mac;
+				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-weak_framework",
@@ -387,6 +390,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ARCHS = x86_64;
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CLANG_ENABLE_MODULES = YES;
@@ -398,17 +402,17 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
-					/Users/eoinlandy/SDKs/AIRSDK_30/runtimes/air/mac,
+					/Users/eoinlandy/SDKs/AIRSDK_32/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_30/runtimes/air/mac;
+				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-weak_framework",