Merge pull request #50 from tuarua/development

Development
tuarua · Mar 6, 2020 · 4745565 · 4745565
2 parents ae9f96b + db36437
commit 4745565
Show file tree

Hide file tree

Showing 68 changed files with 927 additions and 2,560 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 2.6.0
+- AND: Updated to FreKotlin 1.9.5
+- AND: Updated to Android Play Services to 17.0.0
+- AND: Updated to Jetpack
+- iOS: Updated to Google Maps SDK 3.7.0
+- iOS: Updated to FreSwift 4.3.0
+
 ### 2.5.0
 - AND: Updated to FreKotlin 1.8.0
 - Updated to AIR 33 ARM 64bit

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ The dependencies can be downloaded directly from this repo:
     <extensionID>com.google.android.gms.play-services-base</extensionID>
     <extensionID>com.google.android.gms.play-services-location</extensionID>
     <extensionID>com.google.android.gms.play-services-maps</extensionID>
-    <extensionID>com.android.support.support-v4</extensionID>
+     <extensionID>androidx.legacy.legacy-support-v4</extensionID>
     <extensionID>com.google.code.gson.gson</extensionID>
     ...
 </extensions>
@@ -76,9 +76,6 @@ 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
@@ -116,18 +113,15 @@ 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 33 or greater
-- Xcode 10.1
+- IntelliJ IDEA
+- AIR 33.0.2.338+
+- Xcode 11.3
+- wget on macOS via `brew install wget`
 - Android Studio 3 if you wish to edit the Android source
-- wget on macOS
 - Powershell on Windows
 
 ### References

diff --git a/example/.actionScriptProperties b/example/.actionScriptProperties
diff --git a/example/.gitignore b/example/.gitignore
@@ -8,6 +8,8 @@ bin-release/
 bin-release-temp/
 cache/
 
+.key
+
 *.app
 
 # Other files and folders

diff --git a/example/.idea/libraries/androidx_legacy_legacy_support_v4_1_0_0.xml b/example/.idea/libraries/androidx_legacy_legacy_support_v4_1_0_0.xml
diff --git a/example/.idea/libraries/com_android_support_support_v4_27_1_0.xml b/example/.idea/libraries/com_android_support_support_v4_27_1_0.xml
diff --git a/...android_gms_play_services_maps_16_1_0.xml → ...android_gms_play_services_base_17_0_0.xml b/...android_gms_play_services_maps_16_1_0.xml → ...android_gms_play_services_base_17_0_0.xml
diff --git a/...oid_gms_play_services_location_16_0_0.xml → ...oid_gms_play_services_location_17_0_0.xml b/...oid_gms_play_services_location_16_0_0.xml → ...oid_gms_play_services_location_17_0_0.xml
diff --git a/...android_gms_play_services_base_16_0_1.xml → ...android_gms_play_services_maps_17_0_0.xml b/...android_gms_play_services_base_16_0_1.xml → ...android_gms_play_services_maps_17_0_0.xml
diff --git a/...aries/com_google_code_gson_gson_2_8_4.xml → ...aries/com_google_code_gson_gson_2_8_6.xml b/...aries/com_google_code_gson_gson_2_8_4.xml → ...aries/com_google_code_gson_gson_2_8_6.xml
diff --git a/.../libraries/com_tuarua_frekotlin_1_8_0.xml → .../libraries/com_tuarua_frekotlin_1_9_5.xml b/.../libraries/com_tuarua_frekotlin_1_8_0.xml → .../libraries/com_tuarua_frekotlin_1_9_5.xml
diff --git a/example/.idea/runConfigurations/iOS_Simulator.xml b/example/.idea/runConfigurations/iOS_Simulator.xml
diff --git a/example/.project b/example/.project
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,8 @@ bin-release/ @@
     bin-release-temp/
     cache/
+    .key
     *.app
     # Other files and folders
@@ Expand Down @@