From e5468890633507fe90ad41aed2ae84864a14bb80 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 4 Jun 2024 17:26:14 +0200 Subject: [PATCH] Android build config maintenance (#2465) --- benchmark/android/build.gradle | 4 ++-- platform/android/MapLibreAndroid/build.gradle | 3 +++ .../android/MapLibreAndroid/src/cpp/CMakeLists.txt | 2 ++ platform/android/MapLibreAndroidTestApp/build.gradle | 1 + .../QueryRenderedFeaturesBoxSymbolCountActivity.kt | 12 ++++-------- .../src/main/res/layout/activity_espresso_test.xml | 1 - .../src/main/res/layout/activity_manual_zoom.xml | 1 - .../src/main/res/layout/activity_marker_bulk.xml | 1 - .../main/res/layout/activity_press_for_marker.xml | 1 - .../main/res/layout/activity_query_features_box.xml | 1 - platform/android/gradle.properties | 1 - platform/android/gradle/gradle-publish.gradle | 2 +- render-test/android/build.gradle | 4 ++-- test/android/build.gradle | 4 ++-- 14 files changed, 17 insertions(+), 21 deletions(-) diff --git a/benchmark/android/build.gradle b/benchmark/android/build.gradle index de7242684..ee34cf592 100644 --- a/benchmark/android/build.gradle +++ b/benchmark/android/build.gradle @@ -2,7 +2,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:3.5.3' @@ -12,7 +12,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/platform/android/MapLibreAndroid/build.gradle b/platform/android/MapLibreAndroid/build.gradle index 1cf69bd77..b90373113 100644 --- a/platform/android/MapLibreAndroid/build.gradle +++ b/platform/android/MapLibreAndroid/build.gradle @@ -131,6 +131,9 @@ android { kotlinOptions { jvmTarget = "1.8" } + buildFeatures { + buildConfig true + } } licenseReport { diff --git a/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt b/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt index f616d34bd..6890c2451 100644 --- a/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt +++ b/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.10) +project(MapLibreAndroid) + add_subdirectory(../../../../../ ../../../../../${ANDROID_ABI}) diff --git a/platform/android/MapLibreAndroidTestApp/build.gradle b/platform/android/MapLibreAndroidTestApp/build.gradle index 35cc91f10..741a22aa7 100644 --- a/platform/android/MapLibreAndroidTestApp/build.gradle +++ b/platform/android/MapLibreAndroidTestApp/build.gradle @@ -78,6 +78,7 @@ android { buildFeatures { viewBinding = true + buildConfig true } namespace 'org.maplibre.android.testapp' diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt index e18e400fd..e8365a564 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt @@ -26,7 +26,7 @@ class QueryRenderedFeaturesBoxSymbolCountActivity : AppCompatActivity() { lateinit var mapView: MapView lateinit var maplibreMap: MapLibreMap private set - private lateinit var toast: Toast + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_query_features_box) @@ -80,15 +80,11 @@ class QueryRenderedFeaturesBoxSymbolCountActivity : AppCompatActivity() { val features = maplibreMap.queryRenderedFeatures(box, "symbols-layer") // Show count - if (toast != null) { - toast!!.cancel() - } - toast = Toast.makeText( + Toast.makeText( this@QueryRenderedFeaturesBoxSymbolCountActivity, - String.format("%s features in box", features.size), + "${features.size} feature${if (features.size == 1) "" else "s"} in box", Toast.LENGTH_SHORT - ) - toast.show() + ).show() } } } diff --git a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_espresso_test.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_espresso_test.xml index 6c5e81358..f9dbf2d1d 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_espresso_test.xml +++ b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_espresso_test.xml @@ -9,7 +9,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@id/toolbar" app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_manual_zoom.xml index 1fc8c6507..d08194a7c 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_manual_zoom.xml +++ b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_manual_zoom.xml @@ -9,7 +9,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/toolbar" app:maplibre_cameraBearing="220" app:maplibre_cameraTargetLat="50.871062" app:maplibre_cameraTargetLng="1.583210" diff --git a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_marker_bulk.xml index a41b71f93..9cbc149cf 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -9,7 +9,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@id/toolbar" app:maplibre_cameraTargetLat="38.87031" app:maplibre_cameraTargetLng="-77.00897" app:maplibre_cameraZoom="10"/> diff --git a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_press_for_marker.xml index 9d4f26f42..50e9499f8 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_press_for_marker.xml +++ b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_press_for_marker.xml @@ -9,7 +9,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/toolbar" app:maplibre_cameraTargetLat="45.1855569" app:maplibre_cameraTargetLng="5.7215506" app:maplibre_cameraZoom="11" diff --git a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_box.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_box.xml index b783de69d..e6df20a53 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_box.xml +++ b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_box.xml @@ -9,7 +9,6 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@id/toolbar" app:maplibre_cameraTargetLat="52.0907" app:maplibre_cameraTargetLng="5.1214" app:maplibre_cameraZoom="16"/> diff --git a/platform/android/gradle.properties b/platform/android/gradle.properties index d33f742c3..0f4c01d1d 100644 --- a/platform/android/gradle.properties +++ b/platform/android/gradle.properties @@ -2,6 +2,5 @@ android.useAndroidX=true systemProp.org.gradle.internal.http.connectionTimeout=360000 systemProp.org.gradle.internal.http.socketTimeout=360000 org.gradle.jvmargs=-Xmx4096M -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false \ No newline at end of file diff --git a/platform/android/gradle/gradle-publish.gradle b/platform/android/gradle/gradle-publish.gradle index aa934e939..cd38bcd6b 100644 --- a/platform/android/gradle/gradle-publish.gradle +++ b/platform/android/gradle/gradle-publish.gradle @@ -77,7 +77,7 @@ afterEvaluate { afterEvaluate { project -> android.libraryVariants.all { variant -> tasks.androidJavadocs.doFirst { - classpath += files(variant.javaCompile.classpath.files) + classpath += files(variant.javaCompileProvider.get().classpath.files) } } } diff --git a/render-test/android/build.gradle b/render-test/android/build.gradle index 14b398523..5475934b7 100644 --- a/render-test/android/build.gradle +++ b/render-test/android/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:8.4.1' @@ -11,6 +11,6 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/test/android/build.gradle b/test/android/build.gradle index 547d12de1..1cf0c0e59 100644 --- a/test/android/build.gradle +++ b/test/android/build.gradle @@ -2,7 +2,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:8.1.1' @@ -12,7 +12,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } }