diff --git a/CHANGELOG.md b/CHANGELOG.md index 112da21..4fb012e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.5.0 +- AND: Updated to FreKotlin 1.8.0 +- Updated to AIR 33 ARM 64bit + ### 2.4.0 - Added `mapView.buildingsEnabled` setter replaces `Settings.buildingsEnabled` - Added `mapView.trafficEnabled` setter diff --git a/README.md b/README.md index 2ae2622..6b371b5 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Download the latest from the [Releases](https://github.com/tuarua/Google-Maps-AN ##### The ANE + Dependencies From the command line cd into /example and run: - - OSX + - macOS ```shell bash get_android_dependencies.sh ``` @@ -76,6 +76,9 @@ You will also need to include the following in your app manifest. Update accordi ``` +#### AIR 32 & 33 +This ANE is built against AIR 33 SDK. If you wish to use with AIR 32 you will need to replace dx.jar in lib/android/bin/ with [this one](https://github.com/tuarua/Android-ANE-Dependencies/blob/master/AIR32_patch/lib/android/bin/dx.jar?raw=true) + ------------- ## iOS @@ -113,16 +116,18 @@ You will also need to include the following in your app manifest. Update accordi You will need a Google API key [https://developers.google.com/maps/documentation/ios-sdk/get-api-key] +#### AIR 32 & 33 +You should use AIR 32 for iOS builds ### Prerequisites You will need: - IntelliJ IDEA / Flash Builder -- AIR 32.0.0.103 or greater +- AIR 33 or greater - Xcode 10.1 - Android Studio 3 if you wish to edit the Android source -- wget on OSX +- wget on macOS - Powershell on Windows ### References diff --git a/example/.actionScriptProperties b/example/.actionScriptProperties index 824ad01..9face18 100644 --- a/example/.actionScriptProperties +++ b/example/.actionScriptProperties @@ -45,7 +45,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/example/.idea/libraries/com_tuarua_frekotlin.xml b/example/.idea/libraries/com_tuarua_frekotlin.xml deleted file mode 100644 index cdd011a..0000000 --- a/example/.idea/libraries/com_tuarua_frekotlin.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml b/example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml new file mode 100644 index 0000000..1120a3d --- /dev/null +++ b/example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml index 5146523..59407cd 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/Android_Device.xml b/example/.idea/runConfigurations/Android_Device.xml index b147f83..5de926c 100644 --- a/example/.idea/runConfigurations/Android_Device.xml +++ b/example/.idea/runConfigurations/Android_Device.xml @@ -1,10 +1,12 @@ - + - + diff --git a/native_library/android/GoogleMapsANE/app/app.iml b/native_library/android/GoogleMapsANE/app/app.iml index 48ab1c6..1e7a13d 100644 --- a/native_library/android/GoogleMapsANE/app/app.iml +++ b/native_library/android/GoogleMapsANE/app/app.iml @@ -17,7 +17,7 @@ - - - + + + - + - + - + - + @@ -111,40 +124,43 @@ - - + + + + - - - + + + - - + - - - + + + + + + + - - - - + - + + - + @@ -156,13 +172,13 @@ + - - + diff --git a/native_library/android/GoogleMapsANE/app/build.gradle b/native_library/android/GoogleMapsANE/app/build.gradle index 03e15f1..11f7634 100644 --- a/native_library/android/GoogleMapsANE/app/build.gradle +++ b/native_library/android/GoogleMapsANE/app/build.gradle @@ -1,14 +1,15 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion compileSdkVersion versionCode 1 - versionName "2.2.0" + versionName "2.3.0" } buildTypes { release { @@ -16,13 +17,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - + compileOptions { + sourceCompatibility = '1.8' + targetCompatibility = '1.8' + } lintOptions { disable 'GradleDependency','UnusedResources' } } dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'org.greenrobot:eventbus:3.0.0' implementation "com.google.android.gms:play-services-location:$play_location_version" implementation "com.google.android.gms:play-services-maps:$play_maps_version" 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 b1d9fc8..62c2f2d 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 @@ -225,7 +225,7 @@ class MapController(override var context: FREContext?, private var airView: View airView.addView(frame) mMapFragment = MapFragment.newInstance() - val fragmentTransaction: FragmentTransaction = ctx.activity.fragmentManager.beginTransaction() + val fragmentTransaction = ctx.activity.fragmentManager.beginTransaction() fragmentTransaction.add(newId, mMapFragment) fragmentTransaction.commit() mMapFragment.getMapAsync(this) diff --git a/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/PermissionActivity.kt b/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/PermissionActivity.kt index 962d57b..9fb660a 100644 --- a/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/PermissionActivity.kt +++ b/native_library/android/GoogleMapsANE/app/src/main/java/com/tuarua/googlemapsane/PermissionActivity.kt @@ -27,8 +27,8 @@ class PermissionActivity : Activity(), ActivityCompat.OnRequestPermissionsResult override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val extras = intent.extras - val permissions = extras.getStringArray("ptc") + val extras = intent.extras ?: return + val permissions = extras.getStringArray("ptc") ?: return ActivityCompat.requestPermissions(this, permissions, 19001) } diff --git a/native_library/android/GoogleMapsANE/build.gradle b/native_library/android/GoogleMapsANE/build.gradle index 68aad7c..9fbbec1 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.30' - ext.frekotlin_version = '1.7.0' + ext.kotlin_version = '1.3.40' + ext.frekotlin_version = '1.8.0' ext.gson_version = '2.8.4' ext.play_maps_version = '16.1.0' ext.play_location_version = '16.0.0' @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.4.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/wrapper/gradle-wrapper.properties b/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties index 01f3ddc..637fa96 100644 --- a/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties +++ b/native_library/android/GoogleMapsANE/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip