Merge pull request #55 from tuarua/development

3.0.0
tuarua · Dec 31, 2020 · 3e92224 · 3e92224
2 parents 692ef7e + 8a76c55
commit 3e92224
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 3.0.0
+- AND: Updated to FreKotlin 1.42.0
+- iOS: Updated to FreSwift 5.1.0
+- Upgraded to AIR 33.1.1.345
+
 ### 2.9.0
 - AND: Updated to FreKotlin 1.41.0
 - iOS: Updated to FreSwift 5.0.0

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ You will need:
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 12.1
+- Xcode 12.3
 - [.Net Core Runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1)
 - [AIR-Tools](https://github.com/tuarua/AIR-Tools/)
 

diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml
diff --git a/example/.idea/runConfigurations/iOS_Simulator.xml b/example/.idea/runConfigurations/iOS_Simulator.xml
diff --git a/example/GoogleMapsANESample-mobile.iml b/example/GoogleMapsANESample-mobile.iml
@@ -15,7 +15,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -37,7 +37,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/GoogleMaps.bundle" path-in-package="GoogleMaps.bundle" />
             <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>
       <configuration name="Android Device" target-platform="Mobile" pure-as="true" main-class="GoogleMapsANESample" output-file="GoogleMapsANESample-android-mobile.swf" output-folder="$MODULE_DIR$/bin-release/device">
@@ -53,7 +53,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -90,7 +90,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -112,7 +112,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/GoogleMaps.bundle" path-in-package="GoogleMaps.bundle" />
             <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>
@@ -125,11 +125,9 @@
       <sourceFolder url="file://$MODULE_DIR$/system" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.300" 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="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-ios" level="project" />
     <orderEntry type="library" exported="" name="frekotlin" level="project" />
@@ -160,6 +158,8 @@
     <orderEntry type="library" exported="" name="com.google.code.gson.gson-2.8.6" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.9.5" level="project" />
     <orderEntry type="library" exported="" name="android_dependencies" level="project" />
+    <orderEntry type="library" exported="" name="starling" level="project" />
+    <orderEntry type="library" exported="" name="FiraSansSemiBold" level="project" />
     <orderEntry type="library" exported="" name="extensions" level="project" />
   </component>
 </module>
diff --git a/example/air_package.json b/example/air_package.json
@@ -1,6 +1,6 @@
 {
   "name": "maps-sample",
-  "version": "2.9.0",
+  "version": "3.0.0",
   "appDescriptor": "src/Main-app.xml",
   "variables": {
     "googleAppId": "XXX-xx-xx"
@@ -11,6 +11,6 @@
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.GoogleMapsANE": "2.9.0"
+    "com.tuarua.GoogleMapsANE": "3.0.0"
   }
 }
diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml
@@ -6,7 +6,7 @@
   <!-- Used as the filename for the application. Required. -->
   <name>GoogleMapsANE</name>
   <!-- The name that is displayed below the app icon. -->
-  <versionNumber>2.9.0</versionNumber>
+  <versionNumber>3.0.0</versionNumber>
   <!-- Required. -->
   <!-- Settings for the application's initial window. Required. -->
   <initialWindow>

diff --git a/native_extension/ane/air_package.json b/native_extension/ane/air_package.json
@@ -1,18 +1,18 @@
 {
   "name": "com.tuarua.GoogleMapsANE",
-  "version": "2.9.0",
+  "version": "3.0.0",
   "repository": {
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.frekotlin": "1.41.0",
+    "com.tuarua.frekotlin": "1.42.0",
     "com.google.code.gson.gson": "2.8.6",
     "org.greenrobot.eventbus": "3.0.0",
     "androidx.legacy.legacy-support-v4": "1.0.0",
     "com.google.android.gms.play-services-location": "17.0.0",
     "com.google.android.gms.play-services-base": "17.1.0",
     "com.google.android.gms.play-services-maps": "17.0.0",
-    "com.tuarua.iOS.FreSwift": "5.0.0",
-    "com.tuarua.GoogleMapsANE.IosDependencies": "2.9.0"
+    "com.tuarua.iOS.FreSwift": "5.1.0",
+    "com.tuarua.GoogleMapsANE.IosDependencies": "3.0.0"
   }
 }
diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh
@@ -9,7 +9,7 @@ PROJECTNAME=GoogleMapsANE
 fwSuffix="_FW"
 libSuffix="_LIB"
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.300"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
 echo $AIR_SDK
 
 if [ ! -d "$pathtome/../../native_library/ios/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then

diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.GoogleMapsANE</id>
 	<name>Google Maps ANE</name>
 	<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-	<versionNumber>2.9.0</versionNumber>
+	<versionNumber>3.0.0</versionNumber>
     <platforms>
         <platform name="Android-x86">
             <applicationDeployment>

diff --git a/native_extension/ane/platforms/ios/platform.xml b/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/19.0">
-    <sdkVersion>14.1</sdkVersion>
+    <sdkVersion>14.3</sdkVersion>
     <linkerOptions>
         <option>-ios_version_min 9.0</option>
         <option>-w</option>