From 4b1850bf68a72bbd8304e69c858b2a453649e6de Mon Sep 17 00:00:00 2001 From: Eoin Landy Date: Sun, 8 Nov 2020 15:44:34 +0000 Subject: [PATCH] 2.9.0 --- CHANGELOG.md | 5 + README.md | 2 +- example/.idea/misc.xml | 2 +- .../.idea/runConfigurations/iOS_Simulator.xml | 2 +- example/GoogleMapsANESample-mobile.iml | 8 +- example/air_package.json | 4 +- example/src/Main-app.xml | 2 +- native_extension/ane/air_package.json | 8 +- native_extension/ane/build.sh | 2 +- native_extension/ane/extension.xml | 2 +- .../ane/platforms/ios/platform.xml | 3 +- .../android/GoogleMapsANE/.idea/.gitignore | 3 + .../android/GoogleMapsANE/.idea/gradle.xml | 1 + .../.idea/modules/app/GoogleMapsANE.app.iml | 123 +++++++++++++ .../android/GoogleMapsANE/GoogleMapsANE.iml | 3 +- .../android/GoogleMapsANE/app/app.iml | 173 ------------------ .../android/GoogleMapsANE/app/build.gradle | 6 +- .../tuarua/googlemapsane/KotlinController.kt | 4 +- .../com/tuarua/googlemapsane/MapController.kt | 1 - .../android/GoogleMapsANE/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- native_library/ios/GoogleMapsANE/Cartfile | 2 +- .../GoogleMapsANE.xcodeproj/project.pbxproj | 6 +- 23 files changed, 168 insertions(+), 204 deletions(-) create mode 100644 native_library/android/GoogleMapsANE/.idea/.gitignore create mode 100644 native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml delete mode 100644 native_library/android/GoogleMapsANE/app/app.iml diff --git a/CHANGELOG.md b/CHANGELOG.md index f2264cc..fbd4068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### 2.9.0 +- AND: Updated to FreKotlin 1.41.0 +- iOS: Updated to FreSwift 5.0.0 +- Upgraded to AIR 33.1.1.300 + ### 2.8.0 - AND: Updated to FreKotlin 1.40.0 - iOS: Updated to FreSwift 4.5.0 diff --git a/README.md b/README.md index 83c7dc2..b386fcd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ You will need: - IntelliJ IDEA - AIR 33.1.1.217+ -- Xcode 11.6 +- Xcode 12.1 - [.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 b8cca37..e39a66a 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 5745c29..694c0da 100644 --- a/example/.idea/runConfigurations/iOS_Simulator.xml +++ b/example/.idea/runConfigurations/iOS_Simulator.xml @@ -2,7 +2,7 @@ diff --git a/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml b/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml new file mode 100644 index 0000000..3130cc2 --- /dev/null +++ b/native_library/android/GoogleMapsANE/.idea/modules/app/GoogleMapsANE.app.iml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/native_library/android/GoogleMapsANE/GoogleMapsANE.iml b/native_library/android/GoogleMapsANE/GoogleMapsANE.iml index 68e1b52..0f61c2f 100644 --- a/native_library/android/GoogleMapsANE/GoogleMapsANE.iml +++ b/native_library/android/GoogleMapsANE/GoogleMapsANE.iml @@ -8,10 +8,11 @@ - + + diff --git a/native_library/android/GoogleMapsANE/app/app.iml b/native_library/android/GoogleMapsANE/app/app.iml deleted file mode 100644 index 7947197..0000000 --- a/native_library/android/GoogleMapsANE/app/app.iml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 9db4ff8..d31accd 100644 --- a/native_library/android/GoogleMapsANE/app/build.gradle +++ b/native_library/android/GoogleMapsANE/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion compileSdkVersion versionCode 1 versionName "2.7.0" } diff --git a/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/KotlinController.kt b/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/KotlinController.kt index 82d95de..494ef48 100644 --- a/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/KotlinController.kt +++ b/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/KotlinController.kt @@ -94,7 +94,7 @@ class KotlinController : FreKotlinMainController, FreKotlinStateChangeCallback, addresses = geocoder.getFromLocation(coordinate.latitude, coordinate.longitude, 1) sendGeocodeEvent(addresses) } catch (e: IOException) { - dispatchEvent(Constants.ON_ADDRESS_LOOKUP_ERROR, e.localizedMessage) + dispatchEvent(Constants.ON_ADDRESS_LOOKUP_ERROR, e.localizedMessage ?: "") } } return null @@ -111,7 +111,7 @@ class KotlinController : FreKotlinMainController, FreKotlinStateChangeCallback, addresses = geocoder.getFromLocationName(addressSearch, 1) sendGeocodeEvent(addresses) } catch (e: IOException) { - dispatchEvent(Constants.ON_ADDRESS_LOOKUP_ERROR, e.localizedMessage) + dispatchEvent(Constants.ON_ADDRESS_LOOKUP_ERROR, e.localizedMessage ?: "") } } return null diff --git a/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/MapController.kt b/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/MapController.kt index 888f7a1..07ad47c 100644 --- a/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/MapController.kt +++ b/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/MapController.kt @@ -16,7 +16,6 @@ package com.tuarua.googlemapsane import android.Manifest.permission.ACCESS_FINE_LOCATION -import android.app.FragmentTransaction import android.content.pm.PackageManager import android.graphics.Bitmap import android.graphics.RectF diff --git a/native_library/android/GoogleMapsANE/build.gradle b/native_library/android/GoogleMapsANE/build.gradle index 1340df8..8c2aef7 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.0' - ext.frekotlin_version = '1.40.0' + ext.kotlin_version = '1.4.10' + ext.frekotlin_version = '1.41.0' ext.gson_version = '2.8.6' ext.play_maps_version = '17.0.0' ext.play_location_version = '17.0.0' @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties b/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties index 93ccdf5..6b19987 100644 --- a/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties +++ b/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 03 20:42:39 BST 2020 +#Sun Oct 04 16:29:48 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/native_library/ios/GoogleMapsANE/Cartfile b/native_library/ios/GoogleMapsANE/Cartfile index e8d9ad6..61937dd 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/4.5.0/FreSwift.json" ~> 4.5.0 \ No newline at end of file +binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.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 54eefe3..f9f6bd2 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 = 1100; + LastUpgradeCheck = 1210; ORGANIZATIONNAME = "Tua Rua Ltd"; TargetAttributes = { CE3980891E58BAA90062485B = { @@ -548,6 +548,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -608,6 +609,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -698,6 +700,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks", @@ -762,6 +765,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks",