Merge pull request #44 from tuarua/5.2.0

5.2.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 5.2.0
+- Upgrade to Xcode 12.5
+- Upgrade to Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
+
 ### 5.1.0
 - Upgrade to Xcode 12.3
 - Upgrade to Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)

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 12.3+ (12C33) must be used with Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
+#### Xcode 12.5+ (12E262) must be used with Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
 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 12.3
+- Xcode 12.5
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)

framework_src/example-ios/FreSwiftExample iOS.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="Flex" version="4">
-  <component name="FlexBuildConfigurationManager" active="iOS Device">
+  <component name="FlexBuildConfigurationManager" active="iOS Simulator">
     <configurations>
       <configuration name="iOS Simulator" target-platform="Mobile" pure-as="true" main-class="Main" output-file="Main.swf" output-folder="$MODULE_DIR$/bin-release/simulator">
         <dependencies target-player="25.0">
@@ -9,7 +9,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.345" />
+          <sdk name="AIRSDK_33.1.1.476" />
         </dependencies>
         <compiler-options>
           <map>
@@ -35,7 +35,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.345" />
+          <sdk name="AIRSDK_33.1.1.476" />
         </dependencies>
         <compiler-options>
           <option name="additionalOptions" value="-swf-version=43" />
@@ -59,7 +59,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.345" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.476" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="SwiftIOSANE-ios" level="project" />
     <orderEntry type="library" exported="" name="TesseractANE" level="project" />

framework_src/example-ios/Main-app.xml

@@ -3,7 +3,7 @@
     <id>com.tuarua.freswiftdemo</id>
     <filename>FreSwiftExample</filename>
     <name>FreSwiftExample</name>
-    <versionNumber>5.1.0</versionNumber>
+    <versionNumber>5.2.0</versionNumber>
     <initialWindow>
         <content>SWF file name is set automatically at compile time</content>
         <visible>true</visible>
@@ -25,7 +25,7 @@
                 <string>2</string>
             </array>
              <key>MinimumOSVersion</key>
-            <string>9.0</string>
+            <string>11.0</string>
             ]]>
         </InfoAdditions>
 

framework_src/example-osx/FreSwiftExample OSX.iml

@@ -12,7 +12,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.345" />
+          <sdk name="AIRSDK_33.1.1.476" />
         </dependencies>
         <compiler-options>
           <map>
@@ -31,7 +31,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.345" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.476" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="CommonDependencies" level="project" />
     <orderEntry type="library" exported="" name="FreSwiftExampleANE" level="project" />

framework_src/example-osx/Main-app.xml

@@ -3,7 +3,7 @@
     <id>Main</id>
     <filename>Main</filename>
     <name>Main</name>
-    <versionNumber>5.1.0</versionNumber>
+    <versionNumber>5.2.0</versionNumber>
     <extensions>
         <extensionID>com.tuarua.FreSwiftExampleANE</extensionID>
         <extensionID>com.tuarua.FreSwift</extensionID>

framework_src/freswift_native_extension/ane/build_osx.sh

@@ -9,7 +9,7 @@ echo $pathtome
 PROJECT_NAME=FreSwiftExampleANE
 FRESWIFT_NAME=FreSwift
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.476"
 
 #Setup the directory.
 echo "Making directories."

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>5.1.0</versionNumber>
+	<versionNumber>5.2.0</versionNumber>
 	<platforms>
 	<platform name="MacOS-x86-64">
 		<applicationDeployment>

framework_src/native_extension/ane/build.sh

@@ -9,7 +9,7 @@ PROJECTNAME=FreSwiftExampleANE
 fwSuffix="_FW"
 libSuffix="_LIB"
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.476"
 
 ##############################################################################
 

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>5.1.0</versionNumber>
+	<versionNumber>5.2.0</versionNumber>
 	<platforms>
 	<platform name="iPhone-x86">
 		<applicationDeployment>

framework_src/native_extension/ane/platforms/ios/platform.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <platform xmlns="http://ns.adobe.com/air/extension/24.0">
-    <sdkVersion>14.3</sdkVersion>
+    <sdkVersion>14.5</sdkVersion>
     <linkerOptions>
-        <option>-ios_version_min 9.0</option>
         <option>-w</option>
         <option>-ObjC</option>
         <option>-rpath @executable_path/Frameworks</option>

framework_src/native_extension/ane/platforms/tvos/platform.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <platform xmlns="http://ns.adobe.com/air/extension/24.0">
-    <sdkVersion>14.3</sdkVersion>
+    <sdkVersion>14.5</sdkVersion>
     <linkerOptions>
         <option>-w</option>
         <option>-ObjC</option>

framework_src/native_library/FreSwiftExampleANE/FreSwiftExampleANE.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -561,7 +561,7 @@
 		90E26D4D210394DF003E0B9B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1230;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Eoin Landy";
 				TargetAttributes = {
 					90E26D55210394DF003E0B9B = {
@@ -595,7 +595,7 @@
 				};
 			};
 			buildConfigurationList = 90E26D50210394DF003E0B9B /* Build configuration list for PBXProject "FreSwiftExampleANE" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -1120,7 +1120,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.2.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1157,7 +1157,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.2.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1197,7 +1197,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.2.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1236,7 +1236,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.2.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.FreSwift;
 				PRODUCT_NAME = FreSwift;
@@ -1279,7 +1279,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.2.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					"\"Adobe AIR\"",
@@ -1322,7 +1322,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.2.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					"\"Adobe AIR\"",

framework_src/native_library/FreSwiftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (OSX).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

framework_src/native_library/FreSwiftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (iOS).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

framework_src/native_library/FreSwiftExampleANE/FreSwiftExampleANE.xcodeproj/xcshareddata/xcschemes/FreSwift (tvOS).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

starter_project_static/README.md

@@ -17,6 +17,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 12.3
+- Xcode 12.5
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)

starter_project_static/example/get_ios_dependencies.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/ios_dependencies.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.2.0/ios_dependencies.zip
 unzip -u -o ios_dependencies.zip
 rm ios_dependencies.zip
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/AIRSDK_additions.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.2.0/AIRSDK_additions.zip
 unzip -u -o AIRSDK_additions.zip
 rm AIRSDK_additions.zip
 

starter_project_static/native_extension/ane/build_ios.sh

@@ -8,7 +8,7 @@ PROJECTNAME=HelloWorldANE
 fwSuffix="_FW"
 libSuffix="_LIB"
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.476"
 
 
 

starter_project_static/native_extension/ane/extension_ios.xml

@@ -3,7 +3,7 @@
     <id>com.mycompany.HelloWorldANE</id>
 	<name>Hello World ANE</name>
 	<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-	<versionNumber>5.1.0</versionNumber>
+	<versionNumber>5.2.0</versionNumber>
     <platforms>
      <platform name="iPhone-ARM">
         <applicationDeployment>

starter_project_static/native_extension/ane/platforms/ios/platform.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <platform xmlns="http://ns.adobe.com/air/extension/19.0">
-    <sdkVersion>13.0</sdkVersion>
+    <sdkVersion>14.5</sdkVersion>
     <linkerOptions>
-        <option>-ios_version_min 9.0</option>
         <option>-w</option>
         <option>-ObjC</option>
         <option>-rpath @executable_path/Frameworks</option>

starter_project_static/native_library/ios/HelloWorldANE/Cartfile

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

starter_project_static/native_library/ios/HelloWorldANE/HelloWorldANE.xcodeproj/project.pbxproj

@@ -115,7 +115,7 @@
 		CE87F45D1FB259C9005CF7DF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1230;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Tua Rua Ltd";
 				TargetAttributes = {
 					CE87F4741FB259DB005CF7DF = {

starter_projects/example-ios/HelloWorldExample iOS.iml

@@ -9,7 +9,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.345" />
+          <sdk name="AIRSDK_33.1.1.476" />
         </dependencies>
         <compiler-options />
         <packaging-air-desktop />
@@ -28,7 +28,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.345" />
+          <sdk name="AIRSDK_33.1.1.476" />
         </dependencies>
         <compiler-options />
         <packaging-air-desktop />
@@ -48,7 +48,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.345" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.476" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="HelloWorldANE" level="project" />
     <orderEntry type="library" exported="" name="HelloWorldANE-ios" level="project" />

starter_projects/example-ios/README.md

@@ -12,6 +12,6 @@ You will need
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 12.3
+- Xcode 12.5
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)

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/5.1.0/ios_dependencies.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.2.0/ios_dependencies.zip
 unzip -u -o ios_dependencies.zip
 rm ios_dependencies.zip
 
-wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/AIRSDK_additions.zip
+wget https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.2.0/AIRSDK_additions.zip
 unzip -u -o AIRSDK_additions.zip
 rm AIRSDK_additions.zip