Merge pull request #6 from TheMelody/v1.0.2

V1.0.2
TheMelody · May 26, 2023 · d908665 · d908665
2 parents 3cd27e6 + cca983e
commit d908665
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 37 deletions.
diff --git 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/README.md b/README.md
@@ -10,13 +10,13 @@ OmniMap Compose 🗺
 -------
 <table>
  <tr>
-  <td>gd_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/gd_compose?versionPrefix=1.0.1"></td>
+  <td>gd_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/gd_compose?versionPrefix=1.0.2"></td>
  </tr>
  <tr>
-  <td>tencent_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/tencent_compose?versionPrefix=1.0.1"></td>
+  <td>tencent_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/tencent_compose?versionPrefix=1.0.2"></td>
  </tr>
  <tr>
-  <td>baidu_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/baidu_compose?versionPrefix=1.0.1"></td>
+  <td>baidu_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/baidu_compose?versionPrefix=1.0.2"></td>
  </tr>
 </table>
 

diff --git 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
@@ -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
@@ -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"
 }
diff --git 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
+LIB_VERSION_NAME = 1.0.2
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
 
 }
diff --git 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
@@ -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'
 }