Skip to content

Commit

Permalink
2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tuarua committed Apr 11, 2020
1 parent 4745565 commit db784a7
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 40 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/get_android_dependencies.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/get_android_dependencies.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/src/Main-app-android.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>com.tuarua.googlemapsaneexample</id> <!-- Bundle Identifier. Required. -->
<filename>GoogleMapsANE</filename> <!-- Used as the filename for the application. Required. -->
<name>GoogleMapsANE</name> <!-- The name that is displayed below the app icon. -->
<versionNumber>2.6.0</versionNumber> <!-- Required. -->
<versionNumber>2.7.0</versionNumber> <!-- Required. -->

<!-- Settings for the application's initial window. Required. -->
<initialWindow>
Expand Down
2 changes: 1 addition & 1 deletion example/src/Main-app-ios.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>com.tuarua.googlemapsaneexample</id> <!-- Bundle Identifier. Required. -->
<filename>GoogleMapsANE</filename> <!-- Used as the filename for the application. Required. -->
<name>GoogleMapsANE</name> <!-- The name that is displayed below the app icon. -->
<versionNumber>2.6.0</versionNumber> <!-- Required. -->
<versionNumber>2.7.0</versionNumber> <!-- Required. -->

<!-- Settings for the application's initial window. Required. -->
<initialWindow>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/ane/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0</versionNumber>
<versionNumber>2.7.0</versionNumber>
<platforms>
<platform name="Android-x86">
<applicationDeployment>
Expand Down
3 changes: 3 additions & 0 deletions native_library/android/GoogleMapsANE/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 24 additions & 26 deletions native_library/android/GoogleMapsANE/app/app.iml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion native_library/android/GoogleMapsANE/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
minSdkVersion 19
targetSdkVersion 28
versionCode 1
versionName "2.6.0"
versionName "2.7.0"
}
buildTypes {
release {
Expand Down
6 changes: 3 additions & 3 deletions native_library/android/GoogleMapsANE/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions native_library/android/GoogleMapsANE/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion native_library/ios/GoogleMapsANE/Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.3.0/FreSwift.json" ~> 4.3.0
binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.4.0/FreSwift.json" ~> 4.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -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*]" = "";
Expand Down Expand Up @@ -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*]" = "";
Expand Down

0 comments on commit db784a7

Please sign in to comment.