Merge pull request #18 from tuarua/development

1.4.0
tuarua · Aug 2, 2019 · 109e546 · 109e546
2 parents 2c9f531 + c948bd7
commit 109e546
Show file tree

Hide file tree

Showing 24 changed files with 249 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.4.0
+- AND: Updated to FreKotlin 1.8.0
+- Updated to AIR 33 ARM 64bit
+
 ### 1.3.0
 - WIN: C# binaries are now packaged inside the ANE. All of these need to be deleted from your AIRSDK 
 - WIN: FreSharp.ane is now a required dependency for Windows. 

diff --git a/README.md b/README.md
@@ -101,6 +101,9 @@ You will also need to include the following in your app manifest. Update accordi
 </manifest>
 ```
 
+#### AIR 32 & 33
+This ANE is built against AIR 33 SDK. If you wish to use with AIR 32 you will need to replace dx.jar in lib/android/bin/ with [this one](https://github.com/tuarua/Android-ANE-Dependencies/blob/master/AIR32_patch/lib/android/bin/dx.jar?raw=true)
+
 -------------
 
 ## iOS
@@ -118,13 +121,17 @@ bash get_ios_dependencies.sh
 This folder, ios_dependencies/device/Frameworks, must be packaged as part of your app when creating the ipa. How this is done will depend on the IDE you are using.
 After the ipa is created unzip it and confirm there is a "Frameworks" folder in the root of the .app package.
 
+#### AIR 32 & 33
+You should use AIR 32 for iOS builds
+
 ### Prerequisites
 
 You will need:
 
 - IntelliJ IDEA / Flash Builder
 - AIR 32.0.0.103 or greater
 - Android Studio 3 if you wish to edit the Android source
+- Xcode 10.1
 - wget on macOS
 - Powershell on Windows
 

diff --git a/example-mobile/.actionScriptProperties b/example-mobile/.actionScriptProperties
@@ -40,9 +40,9 @@
       </libraryPathEntry>
       <libraryPathEntry kind="3" linkType="1" path="libs/starling.swc" useDefaultLinkType="false"/>
       <libraryPathEntry kind="5" linkType="2" path="${DOCUMENTS}/Zip-ANE/native_extension/ane/ZipANE.ane"/>
-      <libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.tuarua.frekotlin.ane"/>
+      <libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.tuarua.frekotlin-1.8.0.ane"/>
       <libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.google.code.gson.gson-2.8.4.ane"/>
-      <libraryPathEntry kind="5" linkType="2" path="android_dependencies/org.jetbrains.kotlinx.kotlinx-coroutines-android-1.0.1.ane"/>
+      <libraryPathEntry kind="5" linkType="2" path="android_dependencies/org.jetbrains.kotlinx.kotlinx-coroutines-android-1.2.2.ane"/>
     </libraryPath>
     <sourceAttachmentPath/>
   </compiler>
@@ -73,9 +73,9 @@
         <airExcludes/>
         <anePaths>
           <anePathEntry path="${DOCUMENTS}/Zip-ANE/native_extension/ane/ZipANE.ane"/>
-          <anePathEntry path="android_dependencies/com.tuarua.frekotlin.ane"/>
+          <anePathEntry path="android_dependencies/com.tuarua.frekotlin-1.8.0.ane"/>
           <anePathEntry path="android_dependencies/com.google.code.gson.gson-2.8.4.ane"/>
-          <anePathEntry path="android_dependencies/org.jetbrains.kotlinx.kotlinx-coroutines-android-1.0.1.ane"/>
+          <anePathEntry path="android_dependencies/org.jetbrains.kotlinx.kotlinx-coroutines-android-1.2.2.ane"/>
         </anePaths>
         <newLaunchParams/>
         <modifiedLaunchParams/>

diff --git a/.../.idea/libraries/com_tuarua_frekotlin.xml → .../libraries/com_tuarua_frekotlin_1_8_0.xml b/.../.idea/libraries/com_tuarua_frekotlin.xml → .../libraries/com_tuarua_frekotlin_1_8_0.xml
diff --git a/...linx_kotlinx_coroutines_android_1_0_1.xml → ...linx_kotlinx_coroutines_android_1_2_2.xml b/...linx_kotlinx_coroutines_android_1_0_1.xml → ...linx_kotlinx_coroutines_android_1_2_2.xml
diff --git a/example-mobile/.idea/misc.xml b/example-mobile/.idea/misc.xml
diff --git a/example-mobile/.idea/runConfigurations/Android_Device.xml b/example-mobile/.idea/runConfigurations/Android_Device.xml
diff --git a/example-mobile/.idea/runConfigurations/iOS_Simulator.xml b/example-mobile/.idea/runConfigurations/iOS_Simulator.xml
diff --git a/example-mobile/ZipANESample-mobile.iml b/example-mobile/ZipANESample-mobile.iml
@@ -17,19 +17,23 @@
             <entry library-name="com.google.code.gson.gson-2.8.4" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="org.jetbrains.kotlinx.kotlinx-coroutines-android-1.0.1" library-level="project">
+            <entry library-name="com.tuarua.frekotlin-1.8.0" library-level="project">
+              <dependency linkage="Merged" />
+            </entry>
+            <entry library-name="org.jetbrains.kotlinx.kotlinx-coroutines-android-1.2.2" library-level="project">
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_32" />
+          <sdk name="AIRSDK_33" />
         </dependencies>
         <compiler-options>
           <map>
             <entry key="compiler.locale" value="en_US" />
           </map>
+          <option name="additionalOptions" value="-swf-version=44" />
         </compiler-options>
         <packaging-air-desktop />
-        <packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="Main">
+        <packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app-android.xml" package-file-name="Main">
           <files-to-package>
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/embed" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon60x60@2x.png" path-in-package="AppIcon60x60@2x.png" />
@@ -38,6 +42,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon76x76~ipad.png" path-in-package="AppIcon76x76~ipad.png" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon83.5x83.5@2x~ipad.png" path-in-package="AppIcon83.5x83.5@2x~ipad.png" />
           </files-to-package>
+          <AirSigningOptions arch="armv8" />
         </packaging-android>
         <packaging-ios use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="Main" />
       </configuration>
@@ -47,18 +52,9 @@
             <entry library-name="starling" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.tuarua.frekotlin" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
             <entry library-name="ZipANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.google.code.gson.gson-2.8.4" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="org.jetbrains.kotlinx.kotlinx-coroutines-android-1.0.1" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
           </entries>
           <sdk name="AIRSDK_32" />
         </dependencies>
@@ -68,8 +64,8 @@
           </map>
         </compiler-options>
         <packaging-air-desktop />
-        <packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="iOS_Simulator" />
-        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="iOS_Simulator">
+        <packaging-android use-generated-descriptor="false" />
+        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app-ios.xml" package-file-name="iOS_Simulator">
           <files-to-package>
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/simulator" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
@@ -85,18 +81,9 @@
             <entry library-name="starling" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.tuarua.frekotlin" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
             <entry library-name="ZipANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.google.code.gson.gson-2.8.4" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="org.jetbrains.kotlinx.kotlinx-coroutines-android-1.0.1" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
           </entries>
           <sdk name="AIRSDK_32" />
         </dependencies>
@@ -107,7 +94,7 @@
         </compiler-options>
         <packaging-air-desktop />
         <packaging-android use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="iOS_Device" />
-        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="iOS_Device">
+        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app-ios.xml" package-file-name="iOS_Device">
           <files-to-package>
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/device" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
@@ -125,7 +112,7 @@
     <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_32&#9;AIRSDK_33" jdkType="__CompositeFlexSdk__" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="ZipANE" level="project" />
@@ -134,5 +121,7 @@
     <orderEntry type="library" exported="" name="com.google.code.gson.gson-2.8.4" level="project" />
     <orderEntry type="library" exported="" name="org.jetbrains.kotlinx.kotlinx-coroutines-android-0.24.0" level="project" />
     <orderEntry type="library" exported="" name="org.jetbrains.kotlinx.kotlinx-coroutines-android-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="org.jetbrains.kotlinx.kotlinx-coroutines-android-1.2.2" level="project" />
   </component>
 </module>
diff --git a/example-mobile/get_android_dependencies.ps1 b/example-mobile/get_android_dependencies.ps1
@@ -1,11 +1,12 @@
-$AneVersion = "1.3.0"
+$AneVersion = "1.4.0"
+$FreKotlinVersion = "1.8.0"
 $GsonVersion = "2.8.4"
-$KotlinxCoroutinesVersion = "1.0.1"
+$KotlinxCoroutinesVersion = "1.2.2"
 
 $currentDir = (Get-Item -Path ".\" -Verbose).FullName
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 Invoke-WebRequest -Uri https://github.com/tuarua/Zip-ANE/releases/download/$AneVersion/ZipANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\ZipANE.ane"
 Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.code.gson.gson-$GsonVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion.ane?raw=true
-Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.tuarua.frekotlin.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin.ane?raw=true
+Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.tuarua.frekotlin-$FreKotlinVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin-$FreKotlinVersion.ane?raw=true
 Invoke-WebRequest -OutFile "$currentDir\android_dependencies\org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane?raw=true
 
diff --git a/example-mobile/get_android_dependencies.sh b/example-mobile/get_android_dependencies.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-AneVersion="1.3.0"
+AneVersion="1.4.0"
+FreKotlinVersion="1.8.0"
 GsonVersion="2.8.4"
-KotlinxCoroutinesVersion="1.0.1"
+KotlinxCoroutinesVersion="1.2.2"
 
-wget -O android_dependencies/com.tuarua.frekotlin.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin.ane?raw=true
+wget -O android_dependencies/com.tuarua.frekotlin-$FreKotlinVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin-$FreKotlinVersion.ane?raw=true
 wget -O android_dependencies/org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane?raw=true
 wget -O android_dependencies/com.google.code.gson.gson-$GsonVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion.ane?raw=true
 wget -O ../native_extension/ane/ZipANE.ane https://github.com/tuarua/Zip-ANE/releases/download/$AneVersion/ZipANE.ane?raw=true
diff --git a/example-mobile/get_ios_dependencies.sh b/example-mobile/get_ios_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AneVersion="1.3.0"
+AneVersion="1.4.0"
 FreSwiftVersion="3.1.0"
 
 rm -r ios_dependencies/device

diff --git a/example-mobile/src/Main-app.xml → example-mobile/src/Main-app-android.xml b/example-mobile/src/Main-app.xml → example-mobile/src/Main-app-android.xml
@@ -1,5 +1,5 @@
 <?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.0">
 
 
     <!-- A universally unique application identifier. Must be unique across all AIR applications.
@@ -13,7 +13,7 @@
     May have multiple values for each language. See samples or xsd schema file. Optional. -->
     <name>ZipANESample</name>
 
-    <versionNumber>1.1.0</versionNumber>
+    <versionNumber>1.4.0</versionNumber>
 
     <!-- Settings for the application's initial window. Required. -->
     <initialWindow>
@@ -58,6 +58,7 @@
         <manifestAdditions>
             <![CDATA[
              <manifest android:installLocation="auto">
+                <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
                  <uses-permission android:name="android.permission.INTERNET"/>
                  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
                  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -77,24 +78,6 @@
         </manifestAdditions>
     </android>
 
-    <!-- iOS specific capabilities -->
-    <iPhone>
-        <!-- A list of plist key/value pairs to be added to the application Info.plist -->
-        <InfoAdditions>
-            <![CDATA[
-            <key>UIDeviceFamily</key>
-            <array>
-                <!-- iPhone and iPod touch devices -->
-                <string>1</string>
-                <!-- iPad devices -->
-                <string>2</string>
-            </array>
-            <key>MinimumOSVersion</key>
-            <string>9.0</string>
-            ]]>
-        </InfoAdditions>
-        <requestedDisplayResolution>high</requestedDisplayResolution>
-    </iPhone>
     <extensions>
         <extensionID>com.tuarua.frekotlin</extensionID>
         <extensionID>org.jetbrains.kotlinx.kotlinx-coroutines-android</extensionID>