Merge pull request #49 from tuarua/development

2.5.0
tuarua · Aug 2, 2019 · ae9f96b · ae9f96b
2 parents 7628135 + 35763f6
commit ae9f96b
Show file tree

Hide file tree

Showing 29 changed files with 221 additions and 408 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.5.0
+- AND: Updated to FreKotlin 1.8.0
+- Updated to AIR 33 ARM 64bit
+
 ### 2.4.0
 - Added `mapView.buildingsEnabled` setter replaces `Settings.buildingsEnabled`
 - Added `mapView.trafficEnabled` setter

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Download the latest from the [Releases](https://github.com/tuarua/Google-Maps-AN
 ##### The ANE + Dependencies
 
 From the command line cd into /example and run:   
- - OSX
+ - macOS
 ```shell
 bash get_android_dependencies.sh
 ```
@@ -76,6 +76,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
@@ -113,16 +116,18 @@ You will also need to include the following in your app manifest. Update accordi
 You will need a Google API key   
 [https://developers.google.com/maps/documentation/ios-sdk/get-api-key]
 
+#### 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 33 or greater
 - Xcode 10.1
 - Android Studio 3 if you wish to edit the Android source
-- wget on OSX
+- wget on macOS
 - Powershell on Windows
 
 ### References

diff --git a/example/.actionScriptProperties b/example/.actionScriptProperties
@@ -45,7 +45,7 @@
       <libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.google.android.gms.play-services-location-16.0.0.ane"/>
       <libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.google.android.gms.play-services-maps-16.1.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/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/org.greenrobot.eventbus-3.0.0.ane"/>
     </libraryPath>
     <sourceAttachmentPath/>
@@ -70,7 +70,7 @@
           <anePathEntry path="android_dependencies/com.google.android.gms.play-services-location-16.0.0.ane"/>
           <anePathEntry path="android_dependencies/com.google.android.gms.play-services-maps-16.1.0.ane"/>
           <anePathEntry path="android_dependencies/com.google.code.gson.gson-2.8.4.ane"/>
-          <anePathEntry path="android_dependencies/com.tuarua.frekotlin.ane"/>
+          <anePathEntry path="android_dependencies/com.tuarua.frekotlin-1.8.0.ane"/>
           <anePathEntry path="android_dependencies/org.greenrobot.eventbus-3.0.0.ane"/>
         </anePaths>
         <newLaunchParams/>

diff --git a/example/.idea/libraries/com_tuarua_frekotlin.xml b/example/.idea/libraries/com_tuarua_frekotlin.xml
diff --git a/example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml b/example/.idea/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/GoogleMapsANESample-mobile.iml b/example/GoogleMapsANESample-mobile.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="Android Device">
     <configurations>
       <configuration name="iOS Device" target-platform="Mobile" pure-as="true" main-class="GoogleMapsANESample" output-file="GoogleMapsANESample-mobile.swf" output-folder="$MODULE_DIR$/bin-release/device">
         <dependencies>
@@ -14,27 +14,6 @@
             <entry library-name="GoogleMapsANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.android.support.support-v4-27.1.0" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.tuarua.frekotlin" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="org.greenrobot.eventbus-3.0.0" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.google.android.gms.play-services-base-15.0.1" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.google.android.gms.play-services-location-15.0.1" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.google.android.gms.play-services-maps-15.0.1" 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>
           </entries>
           <sdk name="AIRSDK_32" />
         </dependencies>
@@ -50,7 +29,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
         </packaging-android>
-        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/GoogleMapsANESample-app.xml" package-file-name="GoogleMapsANESample">
+        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app-ios.xml" package-file-name="GoogleMapsANESample">
           <files-to-package>
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
@@ -73,41 +52,42 @@
             <entry library-name="GoogleMapsANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.tuarua.frekotlin" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
             <entry library-name="org.greenrobot.eventbus-3.0.0" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.android.support.support-v4-27.1.0" 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="com.google.android.gms.play-services-base-16.0.1" library-level="project">
               <dependency linkage="Merged" />
             </entry>
+            <entry library-name="com.google.android.gms.play-services-maps-16.1.0" library-level="project">
+              <dependency linkage="Merged" />
+            </entry>
             <entry library-name="com.google.android.gms.play-services-location-16.0.0" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.google.android.gms.play-services-maps-16.1.0" library-level="project">
+            <entry library-name="com.tuarua.frekotlin-1.8.0" library-level="project">
+              <dependency linkage="Merged" />
+            </entry>
+            <entry library-name="com.android.support.support-v4-27.1.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>
         </compiler-options>
         <packaging-air-desktop />
-        <packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/GoogleMapsANESample-app.xml" package-file-name="mobile_Android_Device">
+        <packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app-android.xml" package-file-name="mobile_Android_Device">
           <files-to-package>
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
+          <AirSigningOptions arch="armv8" />
         </packaging-android>
         <packaging-ios use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/GoogleMapsANESample-app.xml" package-file-name="mobile_Android_Device">
           <files-to-package>
@@ -130,27 +110,6 @@
             <entry library-name="GoogleMapsANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.android.support.support-v4-27.1.0" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.tuarua.frekotlin" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="org.greenrobot.eventbus-3.0.0" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.google.android.gms.play-services-base-15.0.1" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.google.android.gms.play-services-location-15.0.1" library-level="project">
-              <dependency linkage="Merged" />
-            </entry>
-            <entry library-name="com.google.android.gms.play-services-maps-15.0.1" 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>
           </entries>
           <sdk name="AIRSDK_32" />
         </dependencies>
@@ -166,7 +125,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
         </packaging-android>
-        <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/GoogleMapsANESample-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$/system" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
@@ -187,18 +146,16 @@
       <sourceFolder url="file://$MODULE_DIR$/system" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/assets" 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="WebViewANE-ios" level="project" />
     <orderEntry type="library" exported="" name="FiraSansSemiBold" level="project" />
     <orderEntry type="library" exported="" name="SwiftIOSANE-ios" level="project" />
-    <orderEntry type="library" exported="" name="GoogleMapsANE" level="project" />
     <orderEntry type="library" exported="" name="GoogleMapsANE-ios" level="project" />
     <orderEntry type="library" exported="" name="frekotlin" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin" level="project" />
     <orderEntry type="library" exported="" name="org.greenrobot.eventbus-3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support.support-v4-27.1.0" level="project" />
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-base-11.8.0" level="project" />
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-maps-11.8.0" level="project" />
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-location-11.8.0" level="project" />
@@ -213,5 +170,12 @@
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-base-16.0.1" level="project" />
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-location-16.0.0" level="project" />
     <orderEntry type="library" exported="" name="com.google.android.gms.play-services-maps-16.1.0" level="project" />
+    <orderEntry type="library" exported="" name="com.google.android.gms.play-services-base-17.0.0" level="project" />
+    <orderEntry type="library" exported="" name="androidx.legacy.legacy-support-v4-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="com.google.android.gms.play-services-maps-17.0.0" level="project" />
+    <orderEntry type="library" exported="" name="com.google.android.gms.play-services-location-17.0.0" level="project" />
+    <orderEntry type="library" exported="" name="GoogleMapsANE" level="project" />
+    <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support.support-v4-27.1.0" level="project" />
   </component>
 </module>
diff --git a/example/get_android_dependencies.ps1 b/example/get_android_dependencies.ps1
@@ -1,15 +1,18 @@
-$AneVersion = "2.4.0"
+$AneVersion = "2.5.0"
+$FreKotlinVersion = "1.8.0"
 $PlayerServicesVersion = "16.0.1"
 $MapsVersion = "16.1.0"
 $LocationVersion = "16.0.0"
 $SupportV4Version = "27.1.0"
+$GsonVersion = "2.8.4"
+$EventBusVersion = "3.0.0"
 
 $currentDir = (Get-Item -Path ".\" -Verbose).FullName
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 Invoke-WebRequest -Uri https://github.com/tuarua/Google-Maps-ANE/releases/download/$AneVersion/GoogleMapsANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\GoogleMapsANE.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 -OutFile "$currentDir\android_dependencies\org.greenrobot.eventbus-3.0.0.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/org.greenrobot.eventbus-3.0.0.ane?raw=true
-Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.code.gson.gson-2.8.4.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-2.8.4.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.greenrobot.eventbus-$EventBusVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/org.greenrobot.eventbus-$EventBusVersion.ane?raw=true
+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.android.support.support-v4-$SupportV4Version.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/support/com.android.support.support-v4-$SupportV4Version.ane?raw=true
 Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.android.gms.play-services-base-$PlayerServicesVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-base-$PlayerServicesVersion.ane?raw=true
 Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.android.gms.play-services-location-$LocationVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-location-$LocationVersion.ane?raw=true

diff --git a/example/get_android_dependencies.sh b/example/get_android_dependencies.sh
@@ -1,14 +1,17 @@
 #!/bin/sh
 
-AneVersion="2.4.0"
+AneVersion="2.5.0"
+FreKotlinVersion="1.8.0"
 PlayerServicesVersion="16.0.1"
 MapsVersion="16.1.0"
 LocationVersion="16.0.0"
 SupportV4Version="27.1.0"
+GsonVersion="2.8.4"
+EventBusVersion="3.0.0"
 
-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/org.greenrobot.eventbus-3.0.0.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/org.greenrobot.eventbus-3.0.0.ane?raw=true
-wget -O android_dependencies/com.google.code.gson.gson-2.8.4.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-2.8.4.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.greenrobot.eventbus-$EventBusVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/org.greenrobot.eventbus-$EventBusVersion.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 android_dependencies/com.android.support.support-v4-$SupportV4Version.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/support/com.android.support.support-v4-$SupportV4Version.ane?raw=true
 wget -O android_dependencies/com.google.android.gms.play-services-base-$PlayerServicesVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-base-$PlayerServicesVersion.ane?raw=true
 wget -O android_dependencies/com.google.android.gms.play-services-location-$LocationVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-location-$LocationVersion.ane?raw=true

diff --git a/example/get_ios_dependencies.sh b/example/get_ios_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AneVersion="2.4.0"
+AneVersion="2.5.0"
 FreSwiftVersion="3.1.0"
 
 rm -r ios_dependencies/device