Merge pull request #33 from tuarua/development

Development

Author: tuarua

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 2.1.0
+- macOS: Updated to FreSwift 5.0.0
+
 ### 2.0.0
 - macOS: Updated to FreSwift 4.5.0
 

example/air_package.json

@@ -1,6 +1,6 @@
 {
   "name": "toast-sample",
-  "version": "2.0.0",
+  "version": "2.1.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.0.0"
+    "com.tuarua.DesktopToastANE": "2.1.0"
   }
 }

native_extension/ane/air_package.json

@@ -1,10 +1,10 @@
 {
   "name": "com.tuarua.DesktopToastANE",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "repository": {
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.FreSwift": "4.5.0"
+    "com.tuarua.FreSwift": "5.0.0"
   }
 }

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.0.0</versionNumber>
+    <versionNumber>2.1.0</versionNumber>
 	<platforms>
         <platform name="Windows-x86-64">
             <applicationDeployment>
@@ -19,5 +19,12 @@
                 <finalizer>TRDTTExtFinizer</finalizer>
             </applicationDeployment>
         </platform>
+        <platform name="MacOS-x86-64">
+            <applicationDeployment>
+                <nativeLibrary>DesktopToastANE.framework</nativeLibrary>
+                <initializer>TRDTTExtInizer</initializer>
+                <finalizer>TRDTTExtFinizer</finalizer>
+            </applicationDeployment>
+        </platform>
 	</platforms>
 </extension>

native_library/mac/DesktopToastANE/Cartfile

@@ -1 +1 @@
-binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/FreSwift.json" ~> 4.5.0
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.0

native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj

@@ -147,7 +147,7 @@
 		CE36AF371DF47B7B003C224B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Tua Rua Ltd";
 				TargetAttributes = {
 					CE36AF3F1DF47B7B003C224B = {
@@ -200,7 +200,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "../../../native_extension/ane/build_multi.sh\n";
+			shellScript = "../../../native_extension/ane/build.sh\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -244,6 +244,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -307,6 +308,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;