diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbd4068..b237386 100644
--- 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
index b386fcd..5c21330 100644
--- 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
index e39a66a..750ff5f 100644
--- a/example/.idea/misc.xml
+++ b/example/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/example/.idea/runConfigurations/iOS_Simulator.xml b/example/.idea/runConfigurations/iOS_Simulator.xml
index 694c0da..e1e1248 100644
--- a/example/.idea/runConfigurations/iOS_Simulator.xml
+++ b/example/.idea/runConfigurations/iOS_Simulator.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/example/GoogleMapsANESample-mobile.iml b/example/GoogleMapsANESample-mobile.iml
index adb7906..c4b7fe1 100644
--- a/example/GoogleMapsANESample-mobile.iml
+++ b/example/GoogleMapsANESample-mobile.iml
@@ -15,7 +15,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -125,11 +125,9 @@
-
+
-
-
@@ -160,6 +158,8 @@
+
+
\ No newline at end of file
diff --git a/example/air_package.json b/example/air_package.json
index 0f06116..2021d4f 100644
--- 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
index 3f17ba3..1657903 100644
--- a/example/src/Main-app.xml
+++ b/example/src/Main-app.xml
@@ -6,7 +6,7 @@
GoogleMapsANE
- 2.9.0
+ 3.0.0
diff --git a/native_extension/ane/air_package.json b/native_extension/ane/air_package.json
index 09b01bf..272ffa1 100644
--- 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"
}
}
\ No newline at end of file
diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh
index 7a5b291..c75c1c4 100755
--- 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
index 55a3394..70ba56b 100644
--- a/native_extension/ane/extension.xml
+++ b/native_extension/ane/extension.xml
@@ -3,7 +3,7 @@
com.tuarua.GoogleMapsANE
Google Maps ANE
This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.
- 2.9.0
+ 3.0.0
diff --git a/native_extension/ane/platforms/ios/platform.xml b/native_extension/ane/platforms/ios/platform.xml
index 1bf7d10..e605f36 100644
--- a/native_extension/ane/platforms/ios/platform.xml
+++ b/native_extension/ane/platforms/ios/platform.xml
@@ -1,6 +1,6 @@
- 14.1
+ 14.3
diff --git a/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml b/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml
index 3130cc2..d79477c 100644
--- a/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml
+++ b/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml
@@ -32,31 +32,17 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -77,9 +63,8 @@
-
-
-
+
+
@@ -118,6 +103,6 @@
-
+
\ No newline at end of file
diff --git a/native_library/android/GoogleMapsANE/app/build.gradle b/native_library/android/GoogleMapsANE/app/build.gradle
index d31accd..1ed60d7 100644
--- a/native_library/android/GoogleMapsANE/app/build.gradle
+++ b/native_library/android/GoogleMapsANE/app/build.gradle
@@ -1,6 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 29
@@ -9,7 +8,7 @@ android {
minSdkVersion 19
targetSdkVersion compileSdkVersion
versionCode 1
- versionName "2.7.0"
+ versionName "3.0.0"
}
buildTypes {
release {
diff --git a/native_library/android/GoogleMapsANE/build.gradle b/native_library/android/GoogleMapsANE/build.gradle
index 8c2aef7..7e3343c 100644
--- a/native_library/android/GoogleMapsANE/build.gradle
+++ b/native_library/android/GoogleMapsANE/build.gradle
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.4.10'
- ext.frekotlin_version = '1.41.0'
+ ext.kotlin_version = '1.4.21'
+ ext.frekotlin_version = '1.42.0'
ext.gson_version = '2.8.6'
ext.play_maps_version = '17.0.0'
ext.play_location_version = '17.0.0'
diff --git a/native_library/ios/GoogleMapsANE/Cartfile b/native_library/ios/GoogleMapsANE/Cartfile
index 61937dd..d4dc080 100644
--- a/native_library/ios/GoogleMapsANE/Cartfile
+++ b/native_library/ios/GoogleMapsANE/Cartfile
@@ -1 +1 @@
-binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.0
\ No newline at end of file
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/FreSwift.json" ~> 5.1.0
\ No newline at end of file
diff --git a/native_library/ios/GoogleMapsANE/GoogleMapsANE.xcodeproj/project.pbxproj b/native_library/ios/GoogleMapsANE/GoogleMapsANE.xcodeproj/project.pbxproj
index f9f6bd2..c8210f0 100644
--- a/native_library/ios/GoogleMapsANE/GoogleMapsANE.xcodeproj/project.pbxproj
+++ b/native_library/ios/GoogleMapsANE/GoogleMapsANE.xcodeproj/project.pbxproj
@@ -400,7 +400,7 @@
CE3980631E58BA7F0062485B /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1210;
+ LastUpgradeCheck = 1230;
ORGANIZATIONNAME = "Tua Rua Ltd";
TargetAttributes = {
CE3980891E58BAA90062485B = {
@@ -644,7 +644,7 @@
CE3980941E58BAA90062485B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -668,7 +668,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 2.8.0;
+ MARKETING_VERSION = 3.0.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.GoogleMapsANE;
@@ -689,7 +689,7 @@
CE3980951E58BAA90062485B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -714,7 +714,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 2.8.0;
+ MARKETING_VERSION = 3.0.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.GoogleMapsANE;