From db784a759bdced0ced2676fade01e2695704d0d2 Mon Sep 17 00:00:00 2001 From: Eoin Landy Date: Sat, 11 Apr 2020 18:33:02 +0100 Subject: [PATCH] 2.7.0 --- CHANGELOG.md | 4 ++ example/get_android_dependencies.ps1 | 2 +- example/get_android_dependencies.sh | 2 +- example/src/Main-app-android.xml | 2 +- example/src/Main-app-ios.xml | 2 +- native_extension/ane/extension.xml | 2 +- .../android/GoogleMapsANE/.idea/gradle.xml | 3 ++ .../android/GoogleMapsANE/app/app.iml | 50 +++++++++---------- .../android/GoogleMapsANE/app/build.gradle | 2 +- .../android/GoogleMapsANE/build.gradle | 6 +-- .../android/GoogleMapsANE/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- native_library/ios/GoogleMapsANE/Cartfile | 2 +- .../GoogleMapsANE.xcodeproj/project.pbxproj | 4 +- 14 files changed, 47 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 226be4e..e6912fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.7.0 +- AND: Updated to FreKotlin 1.10.0 +- iOS: Updated to FreSwift 4.4.0 + ### 2.6.0 - AND: Updated to FreKotlin 1.9.5 - AND: Updated to Android Play Services to 17.0.0 diff --git a/example/get_android_dependencies.ps1 b/example/get_android_dependencies.ps1 index 669b5dd..3f80591 100644 --- a/example/get_android_dependencies.ps1 +++ b/example/get_android_dependencies.ps1 @@ -1,5 +1,5 @@ $AneVersion = "2.6.0" -$FreKotlinVersion = "1.9.5" +$FreKotlinVersion = "1.10.0" $PlayerServicesVersion = "17.0.0" $MapsVersion = "17.0.0" $LocationVersion = "17.0.0" diff --git a/example/get_android_dependencies.sh b/example/get_android_dependencies.sh index 8892037..268731c 100755 --- a/example/get_android_dependencies.sh +++ b/example/get_android_dependencies.sh @@ -1,7 +1,7 @@ #!/bin/sh AneVersion="2.6.0" -FreKotlinVersion="1.9.5" +FreKotlinVersion="1.10.0" PlayerServicesVersion="17.0.0" MapsVersion="17.0.0" LocationVersion="17.0.0" diff --git a/example/src/Main-app-android.xml b/example/src/Main-app-android.xml index f1c0c98..7c53247 100644 --- a/example/src/Main-app-android.xml +++ b/example/src/Main-app-android.xml @@ -4,7 +4,7 @@ com.tuarua.googlemapsaneexample GoogleMapsANE GoogleMapsANE - 2.6.0 + 2.7.0 diff --git a/example/src/Main-app-ios.xml b/example/src/Main-app-ios.xml index 841143e..aac1bc9 100644 --- a/example/src/Main-app-ios.xml +++ b/example/src/Main-app-ios.xml @@ -4,7 +4,7 @@ com.tuarua.googlemapsaneexample GoogleMapsANE GoogleMapsANE - 2.6.0 + 2.7.0 diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml index 7d0c81a..43dd300 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.6.0 + 2.7.0 diff --git a/native_library/android/GoogleMapsANE/.idea/gradle.xml b/native_library/android/GoogleMapsANE/.idea/gradle.xml index 7ac24c7..674414f 100644 --- a/native_library/android/GoogleMapsANE/.idea/gradle.xml +++ b/native_library/android/GoogleMapsANE/.idea/gradle.xml @@ -1,8 +1,11 @@ + - - + + - - + - + + - - - + - + + - - + @@ -129,9 +127,9 @@ - - - + + + @@ -170,6 +168,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 cff72dc..9db4ff8 100644 --- a/native_library/android/GoogleMapsANE/app/build.gradle +++ b/native_library/android/GoogleMapsANE/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion 19 targetSdkVersion 28 versionCode 1 - versionName "2.6.0" + versionName "2.7.0" } buildTypes { release { diff --git a/native_library/android/GoogleMapsANE/build.gradle b/native_library/android/GoogleMapsANE/build.gradle index 05ac524..f239520 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.3.61' - ext.frekotlin_version = '1.9.5' + ext.kotlin_version = '1.3.71' + ext.frekotlin_version = '1.10.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.4.2' + classpath 'com.android.tools.build:gradle:3.6.2' 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.properties b/native_library/android/GoogleMapsANE/gradle.properties index aac7c9b..c7fb972 100644 --- a/native_library/android/GoogleMapsANE/gradle.properties +++ b/native_library/android/GoogleMapsANE/gradle.properties @@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true + +android.useAndroidX=true \ No newline at end of file diff --git a/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties b/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties index 637fa96..93ccdf5 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 @@ -#Mon Sep 04 23:10:13 BST 2017 +#Fri Apr 03 20:42:39 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/native_library/ios/GoogleMapsANE/Cartfile b/native_library/ios/GoogleMapsANE/Cartfile index 5ba3e0d..4efdaac 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.3.0/FreSwift.json" ~> 4.3.0 \ No newline at end of file +binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.4.0/FreSwift.json" ~> 4.4.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 7a26123..4772508 100644 --- a/native_library/ios/GoogleMapsANE/GoogleMapsANE.xcodeproj/project.pbxproj +++ b/native_library/ios/GoogleMapsANE/GoogleMapsANE.xcodeproj/project.pbxproj @@ -642,7 +642,7 @@ CE3980941E58BAA90062485B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -687,7 +687,7 @@ CE3980951E58BAA90062485B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";