From e4c31d231ab70d96d49218059762dfff60f5525e Mon Sep 17 00:00:00 2001 From: Kuloud Date: Wed, 20 Mar 2024 17:55:32 +0800 Subject: [PATCH] release 1.0.5 --- CHANGELOG.md | 7 +++++ README.md | 2 +- android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/app/build.gradle | 19 ++++++------ example/android/build.gradle | 9 ------ example/android/settings.gradle | 31 ++++++++++++++----- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile.lock | 12 +++---- example/ios/Runner.xcodeproj/project.pbxproj | 8 ++--- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 13 files changed, 57 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3f8e4b..1a26e2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.0.5 +2024-03-20. +* 升级amap android sdk版本 V10.0.600 2024-03-15 +* 升级amap ios sdk版本 V10.0.600 2024-03-15 +* [example] 适配迁移Gradle声明性插件 https://docs.flutter.dev/release/breaking-changes/flutter-gradle-plugin-apply +* permission_handler 11.1.0 -> 11.3.0 + ## 1.0.4 2024-01-04. * 添加 InfoWindowExtension，支持自定义 InfoWindow 样式 diff --git a/README.md b/README.md index 4689511..5338017 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | | Android | iOS | |-------------|---------|-------| -| **AMapSDK** | 9.8.3 | 9.7.0 | +| **AMapSDK** | 10.0.600 | 10.0.600 | | **Support** | SDK 16+ | 12.0+ | 本插件基于 amap_flutter_map 3.0.0 进行二开的原因： diff --git a/android/build.gradle b/android/build.gradle index 0b30ac4..b82f75a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -33,6 +33,6 @@ android { } dependencies { - implementation 'com.amap.api:3dmap:9.8.3' + implementation 'com.amap.api:3dmap:10.0.600' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ffed3a2..31cca49 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index b3c5c64..491dbfa 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,10 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +13,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,13 +24,11 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 - lintOptions { + lint { disable 'InvalidPackage' } @@ -72,7 +73,7 @@ android { } dependencies { //demo中引入高德地图SDK - implementation 'com.amap.api:3dmap:9.8.3' + implementation 'com.amap.api:3dmap:10.0.600' } flutter { diff --git a/example/android/build.gradle b/example/android/build.gradle index 0822484..1886e40 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,13 +1,4 @@ -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - } -} allprojects { repositories { diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 44e62bc..e2b6ac0 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,11 +1,26 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.4.2" apply false + id "org.jetbrains.kotlin.android" version "1.7.10" apply false +} + +include ":app" -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 4f8d4d2..8c6e561 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 1f3ab61..c812861 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,12 +1,12 @@ PODS: - - AMap3DMap (9.7.0): + - AMap3DMap (10.0.600): - AMapFoundation (>= 1.8.0) - amap_map (1.0.3): - AMap3DMap - Flutter - AMapFoundation (1.8.2) - Flutter (1.0.0) - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter DEPENDENCIES: @@ -28,12 +28,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/permission_handler_apple/ios" SPEC CHECKSUMS: - AMap3DMap: dce25dd3e51e6b92109caa7d0c97fc6055830fb3 + AMap3DMap: d104a679c2bad573c908e0ddadf26bc399678b24 amap_map: 8773e5cacc760edf208b1e6e61000241d26385fa AMapFoundation: 9885c48fc3a78fdfb84a0299a2293e56ea3c9fec - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 PODFILE CHECKSUM: cf0c950f7e9a456b4e325f5b8fc0f98906a3705a -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 2854f39..cc5850d 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -166,7 +166,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -353,7 +353,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -440,7 +440,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -489,7 +489,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b52b2e6..e67b280 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@