Merge pull request #16 from tuarua/development

1.2.0
tuarua · Aug 2, 2019 · 1674aaa · 1674aaa
2 parents c3993ce + d797c18
commit 1674aaa
Show file tree

Hide file tree

Showing 27 changed files with 168 additions and 403 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.2.0
+- AND: Updated to FreKotlin 1.8.0
+- Updated to AIR 33 ARM 64bit
+
 ### 1.1.0
 - Upgraded to AIR 32.0.0.116
 - AND: Updated to FreKotlin 1.7.0

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Vibration Adobe Air Native Extension for iOS 9.0+ and Android 19+.
 #### The ANE + Dependencies
 
 cd into /example and run:
-- OSX (Terminal)
+- macOS (Terminal)
 ```shell
 bash get_android_dependencies.sh
 ```
@@ -36,6 +36,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
@@ -53,15 +56,18 @@ 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
+- AIR 32 or greater
 - Android Studio 3 if you wish to edit the Android source
 - Xcode 10.1
-- wget on OSX
+- wget on macOS
 - Powershell on Windows
 
 ### References

diff --git a/example/.actionScriptProperties b/example/.actionScriptProperties
@@ -36,7 +36,7 @@
       </libraryPathEntry>
       <libraryPathEntry kind="3" linkType="1" path="libs/starling.swc" useDefaultLinkType="false"/>
       <libraryPathEntry kind="5" linkType="2" path="${DOCUMENTS}/Vibration-ANE/native_extension/ane/VibrationANE.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"/>
     </libraryPath>
     <sourceAttachmentPath/>
   </compiler>
@@ -55,6 +55,7 @@
         <airExcludes/>
         <anePaths>
           <anePathEntry path="${DOCUMENTS}/Vibration-ANE/native_extension/ane/VibrationANE.ane"/>
+          <anePathEntry path="${DOCUMENTS}/Vibration-ANE/native_extension/ane/com.tuarua.frekotlin-1.8.0.ane"/>
         </anePaths>
       </airSettings>
       <multiPlatformSettings enabled="true" hideAneLibSymbols="0" includePlatformLibs="false" platformID="com.adobe.flexide.multiplatform.ios.platform" reducedSizePackaging="false" version="1"/>

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/example/.idea/misc.xml b/example/.idea/misc.xml
diff --git a/example/.idea/runConfigurations/Android_Device.xml b/example/.idea/runConfigurations/Android_Device.xml
diff --git a/example/VibrationANESample.iml b/example/VibrationANESample.iml
@@ -8,29 +8,31 @@
             <entry library-name="starling" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.tuarua.frekotlin" library-level="project">
+            <entry library-name="VibrationANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="VibrationANE" library-level="project">
+            <entry library-name="com.tuarua.frekotlin-1.8.0" 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$/system/AppIcon83.5x83.5@2x~ipad.png" path-in-package="AppIcon83.5x83.5@2x~ipad.png" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon76x76~ipad.png" path-in-package="AppIcon76x76~ipad.png" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon76x76@2x~ipad.png" path-in-package="AppIcon76x76@2x~ipad.png" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/[email protected]" path-in-package="[email protected]" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system/[email protected]" path-in-package="[email protected]" />
           </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>
@@ -40,9 +42,6 @@
             <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="VibrationANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
@@ -56,7 +55,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_Simulator" />
-        <packaging-ios 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-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" />
@@ -71,9 +70,6 @@
             <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="VibrationANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
@@ -87,7 +83,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" />
@@ -104,10 +100,11 @@
     <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="com.tuarua.frekotlin" level="project" />
     <orderEntry type="library" exported="" name="VibrationANE" level="project" />
+    <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.8.0" level="project" />
   </component>
 </module>
diff --git a/example/get_android_dependencies.ps1 b/example/get_android_dependencies.ps1
@@ -1,4 +1,7 @@
+$AneVersion = "1.2.0"
+$FreKotlinVersion = "1.8.0"
+
 $currentDir = (Get-Item -Path ".\" -Verbose).FullName
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-Invoke-WebRequest -Uri https://github.com/tuarua/Vibration-ANE/releases/download/1.1.0/VibrationANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\VibrationANE.ane"
-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 -Uri https://github.com/tuarua/Vibration-ANE/releases/download/$AneVersion/VibrationANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\VibrationANE.ane"
+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
diff --git a/example/get_android_dependencies.sh b/example/get_android_dependencies.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-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 ../native_extension/ane/VibrationANE.ane https://github.com/tuarua/Vibration-ANE/releases/download/1.1.0/VibrationANE.ane?raw=true
+
+AneVersion="1.2.0"
+FreKotlinVersion="1.8.0"
+
+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 ../native_extension/ane/VibrationANE.ane https://github.com/tuarua/Vibration-ANE/releases/download/$AneVersion/VibrationANE.ane?raw=true
diff --git a/example/get_ios_dependencies.sh b/example/get_ios_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AneVersion="1.1.0"
+AneVersion="1.2.0"
 FreSwiftVersion="3.1.0"
 
 rm -r ios_dependencies/device

diff --git a/example/src/Main-app-android.xml b/example/src/Main-app-android.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<application xmlns="http://ns.adobe.com/air/application/33.0">
+
+	<id>com.tuarua.vibrationanesample</id>
+	<filename>VibrationANESample</filename>
+	<name>VibrationANESample</name>
+	<versionNumber>1.2.0</versionNumber>
+
+
+	<initialWindow>
+		<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
+        <aspectRatio>portrait</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <fullScreen>true</fullScreen>
+        <renderMode>direct</renderMode>
+        <depthAndStencil>true</depthAndStencil>
+        <visible>true</visible>
+    </initialWindow>
+
+
+    <icon>
+        <image76x76>AppIcon76x76~ipad.png</image76x76>
+        <image120x120>[email protected]</image120x120>
+        <image152x152>AppIcon76x76@2x~ipad.png</image152x152>
+        <image167x167>AppIcon83.5x83.5@2x~ipad.png</image167x167>
+        <image180x180>[email protected]</image180x180>
+    </icon>
+
+
+<android>
+        <manifestAdditions><![CDATA[
+			<manifest android:installLocation="auto">
+			    <uses-permission android:name="android.permission.INTERNET"/>
+			    <uses-permission android:name="android.permission.VIBRATE"/>
+			</manifest>
+			
+		]]></manifestAdditions>
+    </android>
+
+    <extensions>
+    	<extensionID>com.tuarua.frekotlin</extensionID>
+        <extensionID>com.tuarua.VibrationANE</extensionID>
+    </extensions>
+</application>
diff --git a/example/src/Main-app.xml → example/src/Main-app-ios.xml b/example/src/Main-app.xml → example/src/Main-app-ios.xml
@@ -4,7 +4,7 @@
 	<id>com.tuarua.vibrationanesample</id>
 	<filename>VibrationANESample</filename>
 	<name>VibrationANESample</name>
-	<versionNumber>1.1.0</versionNumber>
+	<versionNumber>1.2.0</versionNumber>
 
 
 	<initialWindow>
@@ -26,16 +26,6 @@
         <image180x180>[email protected]</image180x180>
     </icon>
 
-
-<android>
-        <manifestAdditions><![CDATA[
-			<manifest android:installLocation="auto">
-			    <uses-permission android:name="android.permission.INTERNET"/>
-			    <uses-permission android:name="android.permission.VIBRATE"/>
-			</manifest>
-			
-		]]></manifestAdditions>
-    </android>
     <!-- iOS specific capabilities -->
     <iPhone>
         <!-- A list of plist key/value pairs to be added to the application Info.plist -->
@@ -55,7 +45,6 @@
         <requestedDisplayResolution>high</requestedDisplayResolution>
     </iPhone>
     <extensions>
-    	<extensionID>com.tuarua.frekotlin</extensionID>
         <extensionID>com.tuarua.VibrationANE</extensionID>
     </extensions>
 </application>
diff --git a/native_extension/ane/build-android.bat b/native_extension/ane/build-android.bat