Android build config maintenance (#2465)

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()
     }
 }
 

platform/android/MapLibreAndroid/build.gradle

@@ -131,6 +131,9 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 licenseReport {

platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 
+project(MapLibreAndroid)
+
 add_subdirectory(../../../../../
                  ../../../../../${ANDROID_ABI})
 

platform/android/MapLibreAndroidTestApp/build.gradle

@@ -78,6 +78,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        buildConfig true
     }
 
     namespace 'org.maplibre.android.testapp'

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()
             }
         }
     }

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"/>
 
 </RelativeLayout>

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"

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"/>

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"

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"/>

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

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)
         }
     }
 }

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()
     }
 }

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()
     }
 }