tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Android Dependencies, use maplibre-gestures-android (#2714)

Browse Source
This commit is contained in:
Bart Louwers
2024-08-19 21:08:18 +02:00
committed by GitHub
parent ac606a1af2
commit c3a2fa247c
25 changed files with 97 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/MapLibreAndroidTestApp/build.gradle
View File

@@ -29,15 +29,6 @@ android {
multiDexEnabled = true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
nativeBuild(["example-custom-layer"])
packagingOptions {
resources {
@@ -92,11 +83,14 @@ android {
}
}
kotlin {
jvmToolchain(17)
}
dependencies {
implementation project(':MapLibreAndroid')
implementation libs.maplibreJavaTurf
implementation libs.supportAppcompatV7
implementation libs.supportRecyclerView
implementation libs.supportDesign
implementation libs.supportConstraintLayout
@@ -108,6 +102,9 @@ dependencies {
implementation libs.okhttp3
implementation libs.kotlinxCoroutinesCore
implementation libs.kotlinxCoroutinesAndroid
debugImplementation libs.leakCanary
androidTestImplementation libs.supportAnnotations

10
platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/GestureDetectorActivity.kt
View File

@@ -17,11 +17,11 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mapbox.android.gestures.AndroidGesturesManager
import com.mapbox.android.gestures.MoveGestureDetector
import com.mapbox.android.gestures.RotateGestureDetector
import com.mapbox.android.gestures.ShoveGestureDetector
import com.mapbox.android.gestures.StandardScaleGestureDetector
import org.maplibre.android.gestures.AndroidGesturesManager
import org.maplibre.android.gestures.MoveGestureDetector
import org.maplibre.android.gestures.RotateGestureDetector
import org.maplibre.android.gestures.ShoveGestureDetector
import org.maplibre.android.gestures.StandardScaleGestureDetector
import org.maplibre.android.annotations.Marker
import org.maplibre.android.annotations.MarkerOptions
import org.maplibre.android.camera.CameraUpdateFactory

4
platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt
View File

@@ -7,8 +7,8 @@ import android.view.MotionEvent
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.snackbar.Snackbar
import com.mapbox.android.gestures.AndroidGesturesManager
import com.mapbox.android.gestures.MoveGestureDetector
import org.maplibre.android.gestures.AndroidGesturesManager
import org.maplibre.android.gestures.MoveGestureDetector
import org.maplibre.geojson.Feature
import org.maplibre.geojson.FeatureCollection
import org.maplibre.geojson.Point