Gradle Improvements (#2311)

platform/android/MapLibreAndroidTestApp/build.gradle

@@ -18,12 +18,11 @@ def obtainTestBuildType() {
 }
 
 android {
-    compileSdkVersion androidVersions.compileSdkVersion
-
     defaultConfig {
         applicationId "org.maplibre.android.testapp"
-        minSdkVersion androidVersions.minSdkVersion
-        targetSdkVersion androidVersions.targetSdkVersion
+        compileSdk 34
+        minSdkVersion 21
+        targetSdkVersion 33
         versionCode 14
         versionName "6.0.1"
         testInstrumentationRunner "org.maplibre.android.InstrumentationRunner"

platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt

@@ -146,7 +146,10 @@ class BenchmarkActivity : AppCompatActivity() {
 
     private fun getBenchmarkInputData(): BenchmarkInputData {
         // read input for benchmark from JSON file (on CI)
-        val jsonFile = File("${Environment.getExternalStorageDirectory()}/instrumentation-test-input")
+        val jsonFile = File("${Environment.getExternalStorageDirectory()}/instrumentation-test-input.json")
+        Logger.i(TAG, "Environment.getExternalStorageDirectory() = ${Environment.getExternalStorageDirectory()}")
+        Logger.i(TAG, "jsonFile.isFile = ${jsonFile.isFile}")
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && Environment.isExternalStorageManager() && jsonFile.isFile) {
             val jsonFileContents = jsonFile.readText()
             val jsonElement = Json.parseToJsonElement(jsonFileContents)

platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/OverlayMapActivity.kt

@@ -70,10 +70,10 @@ class OverlayMapActivity : AppCompatActivity() {
         private lateinit var paint: Paint
 
         @SuppressLint("DrawAllocation") // only happens once
-        override fun onDraw(canvas: Canvas?) {
+        override fun onDraw(canvas: Canvas) {
             super.onDraw(canvas)
 
-            canvas?.let {
+            canvas.let {
                 if (!::paint.isInitialized) {
                     paint = Paint()
                     paint.color = Color.BLACK