Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts: collect-library/build.gradle
This commit is contained in:
@@ -79,7 +79,7 @@ dependencies {
|
||||
// VTM依赖
|
||||
implementation "net.sf.kxml:kxml2:2.3.0"
|
||||
implementation 'org.slf4j:slf4j-api:2.0.7'
|
||||
implementation "org.mapsforge:vtm:$vtmVersion"
|
||||
api "org.mapsforge:vtm:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-themes:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-android:$vtmVersion"
|
||||
runtimeOnly "org.mapsforge:vtm-android:$vtmVersion:natives-armeabi-v7a"
|
||||
@@ -106,7 +106,7 @@ dependencies {
|
||||
implementation "com.badlogicgames.gdx:gdx-backend-android:1.11.0"
|
||||
implementation "com.caverock:androidsvg:1.4"
|
||||
api "org.mapsforge:vtm-jts:$vtmVersion"
|
||||
implementation 'org.locationtech.jts:jts-core:1.19.0'
|
||||
api 'org.locationtech.jts:jts-core:1.19.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
|
||||
implementation 'com.squareup.okio:okio:3.3.0'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user