Update Android Gradle plugin (#1052)

mapsforge · Jul 27, 2023 · ca90f1e · ca90f1e
1 parent c018748
commit ca90f1e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.2' apply false
 }
 
 allprojects {
@@ -32,15 +32,12 @@ def versionName() { return version }
 
 subprojects {
     tasks.withType(JavaCompile) {
-        sourceCompatibility = JavaVersion.VERSION_1_7
-        targetCompatibility = JavaVersion.VERSION_1_7
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
         options.encoding = 'UTF-8'
         if (JavaVersion.current().isJava9Compatible()) {
             if (!project.properties.containsKey('android')) {
-                if (project.name == 'vtm-desktop-lwjgl3' || project.name == 'vtm-playground' || project.name == 'vtm-theme-comparator')
-                    options.compilerArgs.addAll(['--release', '8'])
-                else
-                    options.compilerArgs.addAll(['--release', '7'])
+                options.compilerArgs.addAll(['--release', '8'])
             }
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -15,6 +15,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library

diff --git a/settings.gradle b/settings.gradle
@@ -36,7 +36,7 @@ include ':vtm-jts'
 include ':vtm-models'
 include ':vtm-mvt'
 include ':vtm-playground'
-include ':vtm-tests'
+//include ':vtm-tests'
 include ':vtm-theme-comparator'
 include ':vtm-themes'
 include ':vtm-web'

diff --git a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java
@@ -297,7 +297,7 @@ protected Collection<PointOfInterest> doInBackground(BoundingBox... params) {
                 org.mapsforge.core.model.BoundingBox bb = new org.mapsforge.core.model.BoundingBox(
                         params[0].getMinLatitude(), params[0].getMinLongitude(),
                         params[0].getMaxLatitude(), params[0].getMaxLongitude());
-                return mPersistenceManager.findInRect(bb, categoryFilter, patterns, null, Integer.MAX_VALUE);
+                return mPersistenceManager.findInRect(bb, categoryFilter, patterns, null, Integer.MAX_VALUE, true);
             } catch (Throwable t) {
                 log.error(t.getMessage(), t);
             }