Merge pull request #42 from tuarua/5.1.0

5.1.0
tuarua · Dec 26, 2020 · 8f0159c · 8f0159c
2 parents 6889565 + b7bd285
commit 8f0159c
Show file tree

Hide file tree

Showing 52 changed files with 140 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 5.1.0
+- Upgrade to Xcode 12.3
+- Upgrade to Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
+
 ### 5.0.0
 - Upgrade to Xcode 12.0
 - Upgrade to Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)

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 12.0+ (12A7209) must be used with Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
+#### Xcode 12.3+ (12C33) must be used with Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
 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.0
+- Xcode 12.3
 - wget on macOS via `brew install wget`
 - [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
diff --git a/framework_src/example-ios/.idea/misc.xml b/framework_src/example-ios/.idea/misc.xml
diff --git a/framework_src/example-ios/.idea/runConfigurations/iOS_simulator.xml b/framework_src/example-ios/.idea/runConfigurations/iOS_simulator.xml
diff --git a/framework_src/example-ios/FreSwiftExample iOS.iml b/framework_src/example-ios/FreSwiftExample iOS.iml
@@ -9,7 +9,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.217" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -25,7 +25,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
         </packaging-ios>
       </configuration>
       <configuration name="iOS Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="Main.swf" output-folder="$MODULE_DIR$/bin-release/device">
@@ -35,7 +35,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.217" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <option name="additionalOptions" value="-swf-version=43" />
@@ -48,7 +48,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
         </packaging-ios>
       </configuration>
     </configurations>
@@ -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.217" 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="SwiftIOSANE-ios" level="project" />
     <orderEntry type="library" exported="" name="TesseractANE" level="project" />

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>5.0.0</versionNumber>
+    <versionNumber>5.1.0</versionNumber>
     <initialWindow>
         <content>SWF file name is set automatically at compile time</content>
         <visible>true</visible>

diff --git a/framework_src/example-osx/.idea/misc.xml b/framework_src/example-osx/.idea/misc.xml
diff --git a/framework_src/example-osx/FreSwiftExample OSX.iml b/framework_src/example-osx/FreSwiftExample OSX.iml
@@ -12,7 +12,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_32" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -31,10 +31,10 @@
     <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="FreSwiftExampleANE" level="project" />
     <orderEntry type="library" exported="" name="CommonDependencies" level="project" />
+    <orderEntry type="library" exported="" name="FreSwiftExampleANE" level="project" />
     <orderEntry type="library" exported="" name="FreSwift" level="project" />
   </component>
 </module>
diff --git a/framework_src/example-osx/Main-app.xml b/framework_src/example-osx/Main-app.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<application xmlns="http://ns.adobe.com/air/application/32.0">
+<application xmlns="http://ns.adobe.com/air/application/33.1">
     <id>Main</id>
     <filename>Main</filename>
     <name>Main</name>
-    <versionNumber>5.0.0</versionNumber>
+    <versionNumber>5.1.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>5.0.0</versionNumber>
+    <versionNumber>5.1.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/build_osx.sh b/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"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
 
 #Setup the directory.
 echo "Making directories."

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

diff --git a/framework_src/native_extension/ane/build.sh b/framework_src/native_extension/ane/build.sh
@@ -9,7 +9,7 @@ PROJECTNAME=FreSwiftExampleANE
 fwSuffix="_FW"
 libSuffix="_LIB"
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
 
 ##############################################################################
 

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

diff --git a/framework_src/native_extension/ane/platforms/ios/platform.xml b/framework_src/native_extension/ane/platforms/ios/platform.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <platform xmlns="http://ns.adobe.com/air/extension/24.0">
-    <sdkVersion>13.0</sdkVersion>
+    <sdkVersion>14.3</sdkVersion>
     <linkerOptions>
         <option>-ios_version_min 9.0</option>
         <option>-w</option>

diff --git a/framework_src/native_extension/ane/platforms/tvos/platform.xml b/framework_src/native_extension/ane/platforms/tvos/platform.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <platform xmlns="http://ns.adobe.com/air/extension/24.0">
-    <sdkVersion>13.0</sdkVersion>
+    <sdkVersion>14.3</sdkVersion>
     <linkerOptions>
         <option>-w</option>
         <option>-ObjC</option>
         <option>-rpath @executable_path/Frameworks</option>
+        <option>-rpath /usr/lib/swift</option>
     </linkerOptions>
 
     <packagedDependencies>