Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts: collect-library/src/main/java/com/navinfo/collect/FlutterBaseActivity.kt settings.gradle
This commit is contained in:
@@ -56,11 +56,6 @@ android {
|
||||
|
||||
dependencies {
|
||||
api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
|
||||
implementation files('libs/vtm-jts-0.16.0.jar')
|
||||
implementation files('libs/vtm-android-gdx-0.17.0-natives-x86.jar')
|
||||
implementation files('libs/vtm-android-gdx-0.17.0-natives-arm64-v8a.jar')
|
||||
implementation files('libs/vtm-android-gdx-0.17.0-natives-armeabi-v7a.jar')
|
||||
implementation files('libs/vtm-android-gdx-0.17.0-natives-x86_64.jar')
|
||||
|
||||
implementation "androidx.appcompat:appcompat:$appcompatVersion"
|
||||
implementation "com.google.android.material:material:$materialVersion"
|
||||
@@ -83,17 +78,22 @@ dependencies {
|
||||
|
||||
implementation "org.mapsforge:vtm-json:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-gdx:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-gdx-poi3d:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-android-mvt:$vtmVersion"
|
||||
implementation "org.mapsforge:vtm-mvt:$vtmVersion"
|
||||
|
||||
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-armeabi-v7a"
|
||||
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-arm64-v8a"
|
||||
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-x86"
|
||||
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-x86_64"
|
||||
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion"
|
||||
|
||||
implementation "com.google.protobuf:protobuf-java:3.6.1"
|
||||
implementation "com.wdtinc:mapbox-vector-tile:3.1.0"
|
||||
implementation "com.caverock:androidsvg:1.4"
|
||||
implementation "com.badlogicgames.gdx:gdx:1.9.10"
|
||||
implementation "com.badlogicgames.gdx:gdx-backend-android:1.9.10"
|
||||
implementation "com.badlogicgames.gdx:gdx:1.11.0"
|
||||
implementation "com.badlogicgames.gdx:gdx-backend-android:1.11.0"
|
||||
implementation "com.caverock:androidsvg:1.4"
|
||||
implementation "org.mapsforge:vtm-jts:$vtmVersion"
|
||||
implementation "org.locationtech.jts:jts-core:1.18.2"
|
||||
implementation "com.squareup.okhttp3:okhttp:3.12.13"
|
||||
implementation "com.squareup.okio:okio:1.15.0"
|
||||
|
||||
Reference in New Issue
Block a user