From 470fd69cd6e392eef3a23f6b855210e2d50803a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=AB=E9=A3=8E=E5=90=B9=E8=BF=87=E7=9A=84=E5=A4=8F?= =?UTF-8?q?=E5=A4=A9?= Date: Fri, 26 May 2023 15:24:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93=E7=89=88=E6=9C=AC=E3=80=81compose?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=87=B31.3.3=E7=A8=B3=E5=AE=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- baidu-map-compose/build.gradle | 2 +- build.gradle | 4 ++-- gd-map-compose/build.gradle | 6 +++--- sample-baidu/build.gradle | 2 +- sample-common/build.gradle | 2 +- sample-gaode/build.gradle | 2 +- sample-google/build.gradle | 2 +- sample-huawei/build.gradle | 2 +- sample-tencent/build.gradle | 4 ++-- sample-ui-components/build.gradle | 6 +++--- tencent-map-compose/build.gradle | 6 +++--- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/baidu-map-compose/build.gradle b/baidu-map-compose/build.gradle index 95d3818..2318e5d 100644 --- a/baidu-map-compose/build.gradle +++ b/baidu-map-compose/build.gradle @@ -27,7 +27,7 @@ android { } } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/build.gradle b/build.gradle index d9eba56..4dbd19b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { ext { - compose_version = '1.3.0-rc01' + compose_version = '1.3.3' } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '7.3.0' apply false id 'com.android.library' version '7.3.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.10' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false id "io.github.gradle-nexus.publish-plugin" version "1.1.0" } diff --git a/gd-map-compose/build.gradle b/gd-map-compose/build.gradle index 5b29737..eaeba02 100644 --- a/gd-map-compose/build.gradle +++ b/gd-map-compose/build.gradle @@ -26,7 +26,7 @@ android { } } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -46,7 +46,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // 高德地图3d - api 'com.amap.api:3dmap:9.5.0' + api 'com.amap.api:3dmap:9.6.2' // 高德地图：搜索相关API，路径规划需要用到这里面的类 - api "com.amap.api:search:9.4.5" + api "com.amap.api:search:9.5.0" } \ No newline at end of file diff --git a/sample-baidu/build.gradle b/sample-baidu/build.gradle index a6ec0a6..bac78f4 100644 --- a/sample-baidu/build.gradle +++ b/sample-baidu/build.gradle @@ -56,7 +56,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { diff --git a/sample-common/build.gradle b/sample-common/build.gradle index feabe4f..12735dd 100644 --- a/sample-common/build.gradle +++ b/sample-common/build.gradle @@ -31,7 +31,7 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { diff --git a/sample-gaode/build.gradle b/sample-gaode/build.gradle index 915d786..b30f8fc 100644 --- a/sample-gaode/build.gradle +++ b/sample-gaode/build.gradle @@ -56,7 +56,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { diff --git a/sample-google/build.gradle b/sample-google/build.gradle index f73c1bf..99d069e 100644 --- a/sample-google/build.gradle +++ b/sample-google/build.gradle @@ -56,7 +56,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { diff --git a/sample-huawei/build.gradle b/sample-huawei/build.gradle index 4db0b53..9134378 100644 --- a/sample-huawei/build.gradle +++ b/sample-huawei/build.gradle @@ -56,7 +56,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { diff --git a/sample-tencent/build.gradle b/sample-tencent/build.gradle index c534185..30050d0 100644 --- a/sample-tencent/build.gradle +++ b/sample-tencent/build.gradle @@ -57,7 +57,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { @@ -77,6 +77,6 @@ dependencies { implementation project(path: ':sample-ui-components') implementation project(path: ':tencent-map-compose') // 定位SDK - implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.5.0' + implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.5.2' } \ No newline at end of file diff --git a/sample-ui-components/build.gradle b/sample-ui-components/build.gradle index 85e5706..c788e30 100644 --- a/sample-ui-components/build.gradle +++ b/sample-ui-components/build.gradle @@ -31,7 +31,7 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } packagingOptions { resources { @@ -42,8 +42,8 @@ android { dependencies { api 'androidx.core:core-ktx:1.8.0' - api "androidx.compose.foundation:foundation:$compose_version" - api "androidx.compose.material:material:$compose_version" + api "androidx.compose.foundation:foundation:1.3.1" + api "androidx.compose.material:material:1.3.1" api "androidx.compose.ui:ui-tooling-preview:$compose_version" api "androidx.compose.ui:ui:$compose_version" api "com.google.accompanist:accompanist-flowlayout:0.26.2-beta" diff --git a/tencent-map-compose/build.gradle b/tencent-map-compose/build.gradle index d930b2d..29bb085 100644 --- a/tencent-map-compose/build.gradle +++ b/tencent-map-compose/build.gradle @@ -27,7 +27,7 @@ android { } } composeOptions { - kotlinCompilerExtensionVersion compose_version + kotlinCompilerExtensionVersion "1.3.2" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -47,7 +47,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // 地图库 - api 'com.tencent.map:tencent-map-vector-sdk:4.5.12' + api 'com.tencent.map:tencent-map-vector-sdk:5.0.0' // 地图组件库，包括小车平移、点聚合等组件功能。 - api 'com.tencent.map:sdk-utilities:1.0.8' + api 'com.tencent.map:sdk-utilities:1.0.9.1' } \ No newline at end of file From 92dd27d0f1232b0f0cfd1a86010b52ee51a26fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=AB=E9=A3=8E=E5=90=B9=E8=BF=87=E7=9A=84=E5=A4=8F?= =?UTF-8?q?=E5=A4=A9?= Date: Fri, 26 May 2023 15:35:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9sample=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sample-baidu/build.gradle | 4 ++-- sample-gaode/build.gradle | 4 ++-- sample-google/build.gradle | 4 ++-- sample-tencent/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sample-baidu/build.gradle b/sample-baidu/build.gradle index bac78f4..d2aa55f 100644 --- a/sample-baidu/build.gradle +++ b/sample-baidu/build.gradle @@ -16,8 +16,8 @@ android { defaultConfig { minSdk rootProject.ext.libraryInfo.minSdk targetSdk rootProject.ext.libraryInfo.targetSdk - versionCode 100 - versionName "1.0.0" + versionCode 102 + versionName "1.0.2" vectorDrawables { useSupportLibrary true diff --git a/sample-gaode/build.gradle b/sample-gaode/build.gradle index b30f8fc..63d46d4 100644 --- a/sample-gaode/build.gradle +++ b/sample-gaode/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.melody.map.myapplication" minSdk rootProject.ext.libraryInfo.minSdk targetSdk rootProject.ext.libraryInfo.targetSdk - versionCode 100 - versionName "1.0.0" + versionCode 102 + versionName "1.0.2" vectorDrawables { useSupportLibrary true diff --git a/sample-google/build.gradle b/sample-google/build.gradle index 99d069e..3b86fba 100644 --- a/sample-google/build.gradle +++ b/sample-google/build.gradle @@ -16,8 +16,8 @@ android { defaultConfig { minSdk rootProject.ext.libraryInfo.minSdk targetSdk rootProject.ext.libraryInfo.targetSdk - versionCode 100 - versionName "1.0.0" + versionCode 102 + versionName "1.0.2" vectorDrawables { useSupportLibrary true diff --git a/sample-tencent/build.gradle b/sample-tencent/build.gradle index 30050d0..9a2a84e 100644 --- a/sample-tencent/build.gradle +++ b/sample-tencent/build.gradle @@ -16,8 +16,8 @@ android { defaultConfig { minSdk rootProject.ext.libraryInfo.minSdk targetSdk rootProject.ext.libraryInfo.targetSdk - versionCode 100 - versionName "1.0.0" + versionCode 102 + versionName "1.0.2" vectorDrawables { useSupportLibrary true From 278de5cc46b76b14019ace197e36a981bf767286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=AB=E9=A3=8E=E5=90=B9=E8=BF=87=E7=9A=84=E5=A4=8F?= =?UTF-8?q?=E5=A4=A9?= Date: Fri, 26 May 2023 15:36:32 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6291554..c0f2c86 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ OmniMap Compose 🗺 ------- - + - + - +
gd_composeMaven Centralgd_composeMaven Central
tencent_composeMaven Centraltencent_composeMaven Central
baidu_composeMaven Centralbaidu_composeMaven Central
From cca983e4ffa8aa51b1333be445fbeecb5adefc27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=AB=E9=A3=8E=E5=90=B9=E8=BF=87=E7=9A=84=E5=A4=8F?= =?UTF-8?q?=E5=A4=A9?= Date: Fri, 26 May 2023 15:36:43 +0800 Subject: [PATCH 4/4] Update android.yml --- .github/workflows/android.yml | 8 ++------ gradle_map.properties | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9874f1f..2a31e33 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -52,12 +52,8 @@ jobs: artifactErrorsFailBuild: true body: | ### 功能更新 - - 新增百度地图能力若干； - - 移除SDK中高德地图隐藏Logo不合规的问题； - - Map可组合项新增：onMapClick、onMapLongClick、onMapPOIClick等事件的回调； - - 升级百度地图SDK最新版本； - ### 问题修复 - - 修复:sample示例中，安卓11+上的错误上下文； + - 升级高德地图、百度地图SDK到最新版本 + - Compose升级至1.3.3稳定版本 token: ${{ secrets.github_token }} commit: master # tag名称 diff --git a/gradle_map.properties b/gradle_map.properties index 598dfdf..9b6534a 100644 --- a/gradle_map.properties +++ b/gradle_map.properties @@ -10,4 +10,4 @@ MIN_SDK_VERSION = 21 HUAWEI_MIN_SDK_VERSION = 24 # publish maven central library version_name -LIB_VERSION_NAME = 1.0.1 \ No newline at end of file +LIB_VERSION_NAME = 1.0.2 \ No newline at end of file