Merge pull request #40 from tuarua/5.0.0

5.0.0
tuarua · Sep 26, 2020 · 6889565 · 6889565
2 parents 01ccb22 + f499d9f
commit 6889565
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 5.0.0
+- Upgrade to Xcode 12.0
+- Upgrade to Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
+
 ### 4.5.0
 - Upgrade to Xcode 11.6
 - Upgrade to Swift version 5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Example Xcode projects showing how to create AIR Native Extensions for iOS, tvOS & macOS using Swift.   
 It supports iOS 9.0+, tvOS 9.2+, macOS 10.10+
 
-#### Xcode 11.6 (11E708) must be used with Apple Swift version 5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)
+#### Xcode 12.0+ (12A7209) must be used with Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
 It is not possible to mix Swift versions in the same app. Therefore all Swift based ANEs must use the same exact version.
 
 This project is used as the basis for the following ANEs   
@@ -219,6 +219,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 11.6
+- Xcode 12.0
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
diff --git a/framework_src/example-ios/Main-app.xml b/framework_src/example-ios/Main-app.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.freswiftdemo</id>
     <filename>FreSwiftExample</filename>
     <name>FreSwiftExample</name>
-    <versionNumber>4.5.0</versionNumber>
+    <versionNumber>5.0.0</versionNumber>
     <initialWindow>
         <content>SWF file name is set automatically at compile time</content>
         <visible>true</visible>

diff --git a/framework_src/example-osx/Main-app.xml b/framework_src/example-osx/Main-app.xml
@@ -3,7 +3,7 @@
     <id>Main</id>
     <filename>Main</filename>
     <name>Main</name>
-    <versionNumber>4.5.0</versionNumber>
+    <versionNumber>5.0.0</versionNumber>
     <extensions>
         <extensionID>com.tuarua.FreSwiftExampleANE</extensionID>
         <extensionID>com.tuarua.FreSwift</extensionID>

diff --git a/framework_src/example-tvos/Main-app.xml b/framework_src/example-tvos/Main-app.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.FreSwiftExample</id>
     <filename>FreSwiftExample</filename>
     <name>FreSwiftExample</name>->
-    <versionNumber>4.5.0</versionNumber>
+    <versionNumber>5.0.0</versionNumber>
     <initialWindow>
         <content>SWF file name is set automatically at compile time</content>
         <visible>true</visible>

diff --git a/framework_src/freswift_native_extension/ane/FreSwift.ane b/framework_src/freswift_native_extension/ane/FreSwift.ane
diff --git a/framework_src/freswift_native_extension/ane/extension_osx.xml b/framework_src/freswift_native_extension/ane/extension_osx.xml
@@ -3,7 +3,7 @@
 	<id>com.tuarua.FreSwift</id>
 	<name>FreSwift</name>
 	<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-	<versionNumber>4.5.0</versionNumber>
+	<versionNumber>5.0.0</versionNumber>
 	<platforms>
 	<platform name="MacOS-x86-64">
 		<applicationDeployment>

diff --git a/framework_src/native_extension/ane/extension.xml b/framework_src/native_extension/ane/extension.xml
@@ -3,7 +3,7 @@
 	<id>com.tuarua.FreSwiftExampleANE</id>
 	<name>FreSwift Example ANE</name>
 	<copyright>This work is licensed under MIT License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-	<versionNumber>4.5.0</versionNumber>
+	<versionNumber>5.0.0</versionNumber>
 	<platforms>
 	<platform name="iPhone-x86">
 		<applicationDeployment>

diff --git a/framework_src/native_library/FreSwiftExampleANE/.gitignore b/framework_src/native_library/FreSwiftExampleANE/.gitignore
@@ -90,3 +90,4 @@ docs/
 create_docs.sh
 FreSwift.framework.zip
 README.md
+wcarthage
diff --git a/framework_src/native_library/FreSwiftExampleANE/FreSwift/FreSwift.h b/framework_src/native_library/FreSwiftExampleANE/FreSwift/FreSwift.h
@@ -13,7 +13,7 @@
  limitations under the License.*/
 
 #if __APPLE__
-#include "TargetConditionals.h"
+#include <TargetConditionals.h>
 #if (TARGET_IPHONE_SIMULATOR) || (TARGET_OS_IPHONE) || (TARGET_OS_TV)
 #import <UIKit/UIKit.h>
 #elif TARGET_OS_MAC

diff --git a/framework_src/native_library/FreSwiftExampleANE/FreSwiftExampleANE.xcodeproj/project.pbxproj b/framework_src/native_library/FreSwiftExampleANE/FreSwiftExampleANE.xcodeproj/project.pbxproj
@@ -561,7 +561,7 @@
 		90E26D4D210394DF003E0B9B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Eoin Landy";
 				TargetAttributes = {
 					90E26D55210394DF003E0B9B = {
@@ -920,6 +920,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;
@@ -983,6 +984,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;
@@ -1115,7 +1117,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1151,7 +1153,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1170,6 +1172,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_IDENTITY = "";
@@ -1189,7 +1192,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1207,6 +1210,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_IDENTITY = "";
@@ -1226,7 +1230,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1268,7 +1272,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_30/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					"\"Adobe AIR\"",
@@ -1310,7 +1314,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_30/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					"\"Adobe AIR\"",

diff --git a/...iftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (OSX).xcscheme b/...iftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (OSX).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FreSwiftExampleANE.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...iftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (iOS).xcscheme b/...iftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (iOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FreSwiftExampleANE.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...ftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (tvOS).xcscheme b/...ftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (tvOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FreSwiftExampleANE.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/starter_project_static/README.md b/starter_project_static/README.md
@@ -17,6 +17,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 11.6
+- Xcode 12.0
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
diff --git a/starter_project_static/native_library/ios/HelloWorldANE/Cartfile b/starter_project_static/native_library/ios/HelloWorldANE/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
diff --git a/starter_projects/example-ios/README.md b/starter_projects/example-ios/README.md
@@ -12,6 +12,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 11.6
+- Xcode 12.0
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
diff --git a/starter_projects/example-ios/get_ios_dependencies.sh b/starter_projects/example-ios/get_ios_dependencies.sh
@@ -3,10 +3,10 @@
 rm -r ios_dependencies/device
 rm -r ios_dependencies/simulator
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/ios_dependencies.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/ios_dependencies.zip
 unzip -u -o ios_dependencies.zip
 rm ios_dependencies.zip
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/AIRSDK_additions.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/AIRSDK_additions.zip
 unzip -u -o AIRSDK_additions.zip
 rm AIRSDK_additions.zip
diff --git a/starter_projects/example-mac/README.md b/starter_projects/example-mac/README.md
@@ -11,6 +11,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 11.6
+- Xcode 12.0
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
diff --git a/starter_projects/example-mac/get_mac_dependencies.sh b/starter_projects/example-mac/get_mac_dependencies.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-wget -O ../native_extension/ane/FreSwift.ane https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/FreSwift.ane?raw=true
+wget -O ../native_extension/ane/FreSwift.ane https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.ane?raw=true
diff --git a/starter_projects/example-tvos/README.md b/starter_projects/example-tvos/README.md
@@ -11,6 +11,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 11.6
+- Xcode 12.0
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
diff --git a/starter_projects/example-tvos/get_tvos_dependencies.sh b/starter_projects/example-tvos/get_tvos_dependencies.sh
@@ -2,10 +2,10 @@
 
 rm -r tvos_dependencies/device
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/tvos_dependencies.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/tvos_dependencies.zip
 unzip -u -o tvos_dependencies.zip
 rm tvos_dependencies.zip
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/AIRSDK_additions.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/AIRSDK_additions.zip
 unzip -u -o AIRSDK_additions.zip
 rm AIRSDK_additions.zip
diff --git a/starter_projects/native_library/ios/HelloWorldANE/Cartfile b/starter_projects/native_library/ios/HelloWorldANE/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
diff --git a/starter_projects/native_library/ios/HelloWorldANE/README.md b/starter_projects/native_library/ios/HelloWorldANE/README.md
@@ -3,7 +3,7 @@
 Example Xcode project showing how to create Air Native Extensions for iOS using Swift.
 It supports iOS 9.0+
 
-#### Xcode 11.6 (11E708) must be used with Apple Swift version 5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)
+#### Xcode 12.0+ (12A7209) must be used with Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
 It is not possible to mix Swift versions in the same app. Therefore all Swift based ANEs must use the same exact version.
 
 #### To download the required FreSwift Framework
@@ -70,6 +70,6 @@ func goBack(ctx: FREContext, argc: FREArgc, argv: FREArgv) -> FREObject? {
 
 You will need
 
-- Xcode 11.6
+- Xcode 12.0
 - IntelliJ IDEA
 - AIR 33.1.1.217+
diff --git a/starter_projects/native_library/mac/HelloWorldANE/Cartfile b/starter_projects/native_library/mac/HelloWorldANE/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
diff --git a/starter_projects/native_library/mac/HelloWorldANE/README.md b/starter_projects/native_library/mac/HelloWorldANE/README.md
@@ -3,7 +3,7 @@
 Example Xcode project showing how to create Air Native Extensions for OSX using Swift.    
 It supports OSX 10.10+
 
-#### Xcode 11.6 (11E708) must be used with Apple Swift version 5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)
+#### Xcode 12.0+ (12A7209) must be used with Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
 It is not possible to mix Swift versions in the same app. Therefore all Swift based ANEs must use the same exact version.
 
 #### To download the required FreSwift Framework
@@ -69,7 +69,7 @@ func goBack(ctx: FREContext, argc: FREArgc, argv: FREArgv) -> FREObject? {
 
 You will need
 
-- Xcode 11.6
+- Xcode 12.0
 - IntelliJ IDEA
 - AIR 33.1.1.217+
 
diff --git a/starter_projects/native_library/tvos/HelloWorldANE/Cartfile b/starter_projects/native_library/tvos/HelloWorldANE/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
diff --git a/starter_projects/native_library/tvos/HelloWorldANE/README.md b/starter_projects/native_library/tvos/HelloWorldANE/README.md
@@ -3,7 +3,7 @@
 Example Xcode project showing how to create Air Native Extensions for tvOS using Swift.   
 It supports tvOS 9.2+
 
-#### Xcode 11.6 (11E708) must be used with Apple Swift version 5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)
+#### Xcode 12.0+ (12A7209) must be used with Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
 It is not possible to mix Swift versions in the same app. Therefore all Swift based ANEs must use the same exact version.
 
 #### To download the required FreSwift Framework
@@ -70,7 +70,7 @@ func goBack(ctx: FREContext, argc: FREArgc, argv: FREArgv) -> FREObject? {
 
 You will need
 
-- Xcode 11.6
+- Xcode 12.0
 - IntelliJ IDEA
 - AIR 33.1.1.217+
Original file line number	Diff line number	Diff line change
		@@ -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