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

2
.github/dependabot.yml vendored
View File

@@ -25,6 +25,8 @@ updates:
- '/test/android'
schedule:
interval: 'weekly'
ignore:
- dependency-name: 'io.github.vvb2060.ndk:curl'
groups:
dependencies:
patterns:

3
.gitmodules vendored
View File

@@ -34,9 +34,6 @@
[submodule "vendor/cpp-httplib"]
path = vendor/cpp-httplib
url = https://github.com/yhirose/cpp-httplib.git
[submodule "platform/android/vendor/mapbox-gestures-android"]
path = platform/android/vendor/mapbox-gestures-android
url = https://github.com/mapbox/mapbox-gestures-android.git
[submodule "docs/doxygen/doxygen-awesome-css"]
path = docs/doxygen/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git

7
platform/android/Makefile
View File

@@ -277,14 +277,9 @@ android-license:
.PHONY: android-ndk-stack
android-ndk-stack: android-ndk-stack-arm-v7
# Updates Android's vendor submodules
.PHONY: android-update-vendor
android-update-vendor:
$(MLN_ANDROID_GRADLE) -Pmaplibre.abis=none updateVendorSubmodules
# Run android nitpick script
.PHONY: run-android-nitpick
run-android-nitpick: android-update-vendor
run-android-nitpick:
$(MLN_ANDROID_GRADLE) -Pmaplibre.abis=none androidNitpick
# Creates a dependency graph using Graphviz

15
platform/android/MapLibreAndroid/build.gradle
View File

@@ -13,7 +13,7 @@ apply from: "${rootDir}/gradle/native-build.gradle"
dependencies {
lintChecks project(":MapLibreAndroidLint")
api libs.maplibreJavaGeoJSON
api libs.mapboxAndroidGestures
api libs.maplibreGestures
implementation libs.maplibreJavaTurf
implementation libs.supportAnnotations
@@ -123,19 +123,15 @@ android {
warningsAsErrors false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
buildConfig true
}
}
kotlin {
jvmToolchain(17)
}
licenseReport {
generateHtmlReport = false
generateJsonReport = true
@@ -157,7 +153,6 @@ configurations {
apply from: "${rootDir}/gradle/gradle-checkstyle.gradle"
apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"
apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle"
apply from: "${rootDir}/gradle/android-nitpick.gradle"
apply from: "${rootDir}/gradle/gradle-publish.gradle"
// intentionally disabled

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationCameraController.java
View File

@@ -10,9 +10,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.android.gestures.MoveGestureDetector;
import com.mapbox.android.gestures.RotateGestureDetector;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.MoveGestureDetector;
import org.maplibre.android.gestures.RotateGestureDetector;
import org.maplibre.android.location.modes.CameraMode;
import org.maplibre.android.maps.MapLibreMap;
import org.maplibre.android.maps.Transform;

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentOptions.java
View File

@@ -15,7 +15,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import com.mapbox.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.R;
import org.maplibre.android.maps.MapLibreMap;
@@ -730,7 +730,7 @@ public class LocationComponentOptions implements Parcelable {
* like zooming in and out, without breaking tracking.
* <p>
* <strong>Note</strong>: If set to true, this can overwrite some of the gesture thresholds
* and the custom {@link com.mapbox.android.gestures.AndroidGesturesManager} that was set with
* and the custom {@link org.maplibre.android.gestures.AndroidGesturesManager} that was set with
* {@link MapLibreMap#setGesturesManager(AndroidGesturesManager, boolean, boolean)}.
*
* @return true if gestures are adjusted when in one of the camera tracking modes, false otherwise
@@ -1784,7 +1784,7 @@ public class LocationComponentOptions implements Parcelable {
* like zooming in and out, without breaking tracking.
* <p>
* <strong>Note</strong>: This can overwrite some of the gesture thresholds
* and the custom {@link com.mapbox.android.gestures.AndroidGesturesManager} that was set with
* and the custom {@link org.maplibre.android.gestures.AndroidGesturesManager} that was set with
* {@link MapLibreMap#setGesturesManager(AndroidGesturesManager, boolean, boolean)}.
*
* @param trackingGesturesManagement true if gestures should be adjusted when in one of the camera tracking modes,

18
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapGestureDetector.java
View File

@@ -15,13 +15,13 @@ import android.view.animation.DecelerateInterpolator;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.android.gestures.MoveGestureDetector;
import com.mapbox.android.gestures.MultiFingerTapGestureDetector;
import com.mapbox.android.gestures.RotateGestureDetector;
import com.mapbox.android.gestures.ShoveGestureDetector;
import com.mapbox.android.gestures.StandardGestureDetector;
import com.mapbox.android.gestures.StandardScaleGestureDetector;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.MoveGestureDetector;
import org.maplibre.android.gestures.MultiFingerTapGestureDetector;
import org.maplibre.android.gestures.RotateGestureDetector;
import org.maplibre.android.gestures.ShoveGestureDetector;
import org.maplibre.android.gestures.StandardGestureDetector;
import org.maplibre.android.gestures.StandardScaleGestureDetector;
import org.maplibre.android.R;
import org.maplibre.android.constants.MapLibreConstants;
import org.maplibre.android.log.Logger;
@@ -124,7 +124,7 @@ final class MapGestureDetector {
if (attachDefaultListeners) {
StandardGestureListener standardGestureListener = new StandardGestureListener(
context.getResources().getDimension(
com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
org.maplibre.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
MoveGestureListener moveGestureListener = new MoveGestureListener();
ScaleGestureListener scaleGestureListener = new ScaleGestureListener(
context.getResources().getDimension(R.dimen.maplibre_density_constant),
@@ -138,7 +138,7 @@ final class MapGestureDetector {
context.getResources().getDimension(R.dimen.maplibre_angular_velocity_multiplier),
context.getResources().getDimension(R.dimen.maplibre_minimum_angular_velocity),
context.getResources().getDimension(
com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
org.maplibre.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
ShoveGestureListener shoveGestureListener = new ShoveGestureListener();
TapGestureListener tapGestureListener = new TapGestureListener();

10
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java
View File

@@ -15,11 +15,11 @@ import androidx.annotation.Nullable;
import androidx.annotation.Size;
import androidx.annotation.UiThread;
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.geojson.Feature;
import org.maplibre.geojson.Geometry;
import org.maplibre.android.MapStrictMode;

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java
View File

@@ -20,7 +20,7 @@ import androidx.annotation.UiThread;
import androidx.collection.LongSparseArray;
import timber.log.Timber;
import com.mapbox.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.MapStrictMode;
import org.maplibre.android.MapLibre;
import org.maplibre.android.R;

4
platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt
View File

@@ -3,8 +3,8 @@ package org.maplibre.android.location
import android.graphics.PointF
import android.graphics.RectF
import android.location.Location
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.android.camera.CameraPosition
import org.maplibre.android.camera.CameraUpdate
import org.maplibre.android.camera.CameraUpdateFactory.newCameraPosition

8
platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt
View File

@@ -1,10 +1,10 @@
package org.maplibre.android.maps
import android.graphics.PointF
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.MoveGestureDetector
import org.maplibre.android.gestures.RotateGestureDetector
import org.maplibre.android.gestures.ShoveGestureDetector
import org.maplibre.android.gestures.StandardScaleGestureDetector
import org.maplibre.android.geometry.LatLng
import org.maplibre.android.maps.MapLibreMap.*
import org.junit.Before

14
platform/android/MapLibreAndroidLint/build.gradle
View File

@@ -18,14 +18,6 @@ dependencies {
testImplementation libs.lintTests
}
compileKotlin {
kotlinOptions {
jvmTarget = "17"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "17"
}
}
kotlin {
jvmToolchain(17)
}

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

8
platform/android/gradle/gradle-update-vendor-modules.gradle
View File

@@ -1,8 +0,0 @@
task updateVendorSubmodules {
doLast {
exec {
workingDir = "${rootDir}"
commandLine "git", "submodule", "update", "--init", "vendor"
}
}
}

24
platform/android/gradle/libs.versions.toml
View File

@@ -1,6 +1,6 @@
[versions]
mapLibreServices = "6.0.1"
mapboxGestures = "0.7.0"
maplibreGestures = "0.0.1"
appCompat = "1.7.0"
constraintLayout = "2.1.4"
interpolator = "1.0.0"
@@ -11,7 +11,7 @@ espresso = "3.6.1"
testRunner = "1.2.1"
testRules = "1.6.1"
fragment = "1.8.2"
annotation = "1.8.1"
annotation = "1.8.2"
leakCanary = "2.14"
junit = "4.13.2"
mockito = "5.12.0"
@@ -19,9 +19,9 @@ mockk = "1.13.12"
robolectric = "4.13"
timber = "5.0.1"
okhttp = "4.12.0"
kotlin = "2.0.0"
kotlin = "2.0.10"
licenses = "0.9.8"
lint = "31.5.1"
lint = "31.5.2"
appcenter = "1.5"
commonsIO = "2.16.1"
assertj = "3.26.3"
@@ -31,18 +31,19 @@ multidex = "2.0.1"
androidxTestExtJUnit = "1.1.5"
androidxTestCoreKtx = "1.5.0"
kotlinxSerializationJson = "1.6.0"
kotlinxCoroutinesTest = "1.6.4"
kotlinxCoroutines = { strictly = "[1.0, 2.0[" }
androidGradlePlugin = "8.5.1"
androidGradlePlugin = "8.5.2"
[libraries]
kotlinxCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
kotlinxCoroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
kotlinxCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
kotlinxCoroutinesAndroid = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
maplibreJavaGeoJSON = { group = "org.maplibre.gl", name = "android-sdk-geojson", version.ref = "mapLibreServices" }
mapboxAndroidGestures = { group = "com.mapbox.mapboxsdk", name = "mapbox-android-gestures", version.ref = "mapboxGestures" }
maplibreGestures = { group = "org.maplibre.gl", name = "maplibre-android-gestures", version.ref = "maplibreGestures" }
maplibreJavaTurf = { group = "org.maplibre.gl", name = "android-sdk-turf", version.ref = "mapLibreServices" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
amdroidxJunit = { group = "androidx.test.ext", name = "junit", version.ref = "testRunner" }
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
@@ -55,7 +56,6 @@ testEspressoIntents = { group = "androidx.test.espresso", name = "espresso-inten
testEspressoContrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" }
testUiAutomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiAutomator" }
supportAnnotations = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" }
supportAppcompatV7 = { group = "androidx.appcompat", name = "appcompat", version.ref = "appCompat" }
supportFragmentV4 = { group = "androidx.fragment", name = "fragment", version.ref = "fragment" }
supportRecyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" }
supportConstraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" }
@@ -89,6 +89,6 @@ androidGradlePlugin = { group = "com.android.tools.build", name = "gradle", vers
[plugins]
nexusPublishPlugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
kotlinter = { id = "org.jmailen.kotlinter", version = "4.4.1" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version = "2.0.0" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version = "2.0.10" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "2.0.0" }
kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "2.0.10" }

10
platform/android/src/test/render_test_runner.cpp
View File

@@ -35,7 +35,10 @@ void android_main(struct android_app* app) {
int finishedTestCount = 0;
std::function<void()> testStatus = [&]() {
ALooper_pollAll(0, &outFd, &outEvents, reinterpret_cast<void**>(&source));
auto result = ALooper_pollOnce(0, &outFd, &outEvents, reinterpret_cast<void**>(&source));
if (result == ALOOPER_POLL_ERROR) {
throw std::runtime_error("ALooper_pollOnce returned an error");
}
if (source != nullptr) {
source->process(app, source);
@@ -56,7 +59,10 @@ void android_main(struct android_app* app) {
changeState(env, app, result);
}
while (true) {
ALooper_pollAll(0, &outFd, &outEvents, reinterpret_cast<void**>(&source));
auto result = ALooper_pollOnce(0, &outFd, &outEvents, reinterpret_cast<void**>(&source));
if (result == ALOOPER_POLL_ERROR) {
throw std::runtime_error("ALooper_pollOnce returned an error");
}
if (source != nullptr) {
source->process(app, source);

2
platform/android/src/test/test_runner_common.cpp
View File

@@ -1,6 +1,8 @@
#include "test_runner_common.hpp"
#include <android/log.h>
#include <functional>
namespace mbgl {
void Log::platformRecord(EventSeverity severity, const std::string& msg) {

1
platform/android/vendor/mapbox-gestures-android vendored

Submodule platform/android/vendor/mapbox-gestures-android deleted from 6fc34d91fc

11
render-test/android/app/build.gradle
View File

@@ -1,6 +1,8 @@
apply plugin: 'com.android.application'
android {
ndkVersion '27.0.12077973'
sourceSets {
test {
assets.srcDirs += ['../../../metrics']
@@ -54,9 +56,8 @@ android {
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
androidTestImplementation 'androidx.test:rules:1.5.0'
implementation libs.supportConstraintLayout
androidTestImplementation libs.testRunner
androidTestImplementation libs.testEspressoCore
androidTestImplementation libs.testRules
}

2
render-test/android/build.gradle
View File

@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.1'
classpath libs.androidGradlePlugin
}
}

12
render-test/android/gradle/libs.versions.toml Normal file
View File

@@ -0,0 +1,12 @@
[versions]
androidGradlePlugin = "8.5.2"
espresso = "3.6.1"
[libraries]
androidGradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin"}
supportConstraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" }
testRunner = { group = "androidx.test.ext", name = "junit", version = "1.2.1" }
testEspressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
testRules = { group = "androidx.test", name = "rules", version = "1.6.1" }
[plugins]

7
test/android/app/build.gradle
View File

@@ -50,10 +50,9 @@ android {
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test:rules:1.6.1'
implementation 'io.github.vvb2060.ndk:curl:8.8.0'
}

2
test/android/build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.1'
classpath 'com.android.tools.build:gradle:8.5.2'
}
}