httpsgithu · pull · Jun 19, 2024 · Jun 19, 2024 · Jun 19, 2024 · Jun 19, 2024
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Forum
+    url: https://github.com/mapsforge/mapsforge/discussions
+    about: Ask questions and feature requests here
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -0,0 +1,4 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -2,22 +2,23 @@ name: Android CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: '11'
-        distribution: 'adopt'
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/README.md b/README.md
@@ -1,25 +1,29 @@
-[![Maven Central](https://img.shields.io/maven-central/v/org.mapsforge/mapsforge-core.svg)](https://search.maven.org/search?q=g:org.mapsforge)
+[![](https://jitpack.io/v/mapsforge/mapsforge.svg)](https://jitpack.io/#mapsforge/mapsforge)
 [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](http://www.gnu.org/licenses/lgpl-3.0)
 
 # Mapsforge
 
 <img src="docs/logo/Mapsforge.svg" style="bottom:0;" width="200" align="right">
 
+Vector map library and writer - running on Android and Desktop.
+
 See the **[integration guide](docs/Integration.md)** and [changelog](docs/Changelog.md). And read through [how to contribute](docs/CONTRIBUTING.md) guidelines.
 
-If you have any questions or problems, don't hesitate to ask the Discussions for help.
+If you have any questions or problems, don't hesitate to ask the [forum](https://github.com/mapsforge/mapsforge/discussions) for help.
 
 - Mapsforge project uses a [compact file format](docs/Specification-Binary-Map-File.md) for fast ad-hoc rendering of OpenStreetMap data.
 - We provide tools to [compile your own maps](docs/Getting-Started-Map-Writer.md) with detailed [instructions](docs/MapCreation.md) and also [precompiled maps](https://download.mapsforge.org/).
-- It provides [simple boilerplate code](mapsforge-samples-android/src/main/java/org/mapsforge/samples/android/GettingStarted.java) to build applications for Android that display OpenStreetMap-based maps.
+- It provides [simple boilerplate code](mapsforge-samples-android) to build applications for Android that display OpenStreetMap based maps with rotation and hillshading.
 - It provides a library to build standalone applications in Java ([instructions](docs/Desktop.md)).
 - Mapsforge maps can be flexibly styled with XML style files ([render themes](docs/Rendertheme.md)).
+- Mapsforge library supports offline high resolution [hill shading](https://github.com/mapsforge/mapsforge/blob/master/mapsforge-samples-android/src/main/java/org/mapsforge/samples/android/HillshadingMapViewer.java).
 - We provide [tools & library](docs/POI.md) for POI search and also [precompiled POI](https://download.mapsforge.org/).
 - Mapsforge supports Android 2.3.3 (API level 10) and above.
 - Mapsforge is used by many [applications](docs/Mapsforge-Applications.md).
 - Mapsforge is in active [development](docs/Contributors.md). 
 - Mapsforge [map providers](docs/Mapsforge-Maps.md).
 - Mapsforge [talks](docs/Mapsforge-Talks.md).
+- Building Mapsforge: set `ANDROID_HOME` environment variable with the Android SDK installation directory
 
 ## License
 
@@ -33,8 +37,9 @@ In other words, you are allowed to include Mapsforge library in your Android app
 
 | Android       |
 | ------------- |
-|<img src="docs/images/android.png" width="1000">|
+|![Mapsforge](https://github.com/user-attachments/assets/41d66231-ce00-4647-856e-86092dd60d12)|
+|![Mapsforge2](https://github.com/user-attachments/assets/2898c12a-d051-412a-acd2-e1c4a847cd57)|
 
 | Desktop       |
 | ------------- |
-|![Desktop](docs/images/desktop.png)|
+|![2024-12-18-adaptive10](https://github.com/user-attachments/assets/f2fcb16a-e12d-4290-bdd4-ac901ea8a794)|
diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,11 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
+plugins {
+    id 'com.android.application' version '8.12.3' apply false
 }
 
 allprojects {
     group = 'org.mapsforge'
     version = 'master-SNAPSHOT'
-    ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
-    ext.androidBuildVersionTools = "30.0.3"
     ext.jUnitVersion = "4.12"
 
     if (JavaVersion.current().isJava8Compatible()) {
@@ -26,33 +17,24 @@ allprojects {
     }
 }
 
-static def androidCompileSdk() { return 30 }
+static def androidCompileSdk() { return 36 }
 
-// 14 for Support Library, 16 for sqlite-android
-static def androidMinSdk() { return 16 }
+static def androidMinSdk() { return 21 }
 
-static def androidTargetSdk() { return 30 }
+static def androidTargetSdk() { return 36 }
 
 static def versionCode() { return 1 }
 
 def versionName() { return version }
 
 subprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
     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.contains('writer'))
-                    options.compilerArgs.addAll(['--release', '8'])
-                else
-                    options.compilerArgs.addAll(['--release', '7'])
+                options.compilerArgs.addAll(['--release', '8'])
             }
         }
     }

diff --git a/deploy.gradle b/deploy.gradle
@@ -1,94 +1,73 @@
 apply plugin: 'signing'
 
-if (project.hasProperty("android")) {
-    task sourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-    }
-
-    task javadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-        classpath += project.android.libraryVariants.toList().first().javaCompileProvider.get().classpath
-    }
-} else {
-    task sourcesJar(type: Jar) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
+java {
+    withJavadocJar()
+    withSourcesJar()
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
-signing {
-    required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-            }
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-            }
-
-            pom.project {
-                packaging 'jar'
-
-                name 'mapsforge'
-                description 'Vector map library written in Java - running on Android and Desktop.'
-                url 'https://github.com/mapsforge/mapsforge'
-
+publishing {
+    publications {
+        maven(MavenPublication) {
+            pom {
+                name = 'Mapsforge'
+                description = 'Vector map library and writer - running on Android and Desktop.'
+                url = 'https://github.com/mapsforge/mapsforge'
                 licenses {
                     license {
-                        name 'GNU Lesser GPL'
-                        url 'http://www.gnu.org/licenses/lgpl.html'
-                        distribution 'repo'
+                        name = 'GNU Lesser GPL'
+                        url = 'https://www.gnu.org/licenses/lgpl.html'
                     }
                 }
-
-                scm {
-                    connection 'scm:git:https://github.com/mapsforge/mapsforge'
-                    developerConnection 'scm:git:https://github.com/mapsforge/mapsforge'
-                    url 'https://github.com/mapsforge/mapsforge'
-                }
-
                 developers {
                     developer {
-                        id 'thilo.muehlberg'
-                        name 'Thilo Mühlberg'
-                        email '[email protected]'
+                        id = 'thilo.muehlberg'
+                        name = 'Thilo Mühlberg'
+                        email = '[email protected]'
                     }
                     developer {
-                        id 'jjbross'
-                        name 'Jürgen Broß'
-                        email '[email protected]'
+                        id = 'jjbross'
+                        name = 'Jürgen Broß'
+                        email = '[email protected]'
                     }
                     developer {
-                        id 'ludwigbrinckmann'
-                        name 'Ludwig M Brinckmann'
-                        email '[email protected]'
+                        id = 'ludwigbrinckmann'
+                        name = 'Ludwig M Brinckmann'
+                        email = '[email protected]'
                     }
                     developer {
-                        id 'devemux86'
-                        name 'Emux'
-                        email '[email protected]'
+                        id = 'devemux86'
+                        name = 'Emux'
+                        email = '[email protected]'
                     }
                 }
+                scm {
+                    connection = 'scm:git:https://github.com/mapsforge/mapsforge'
+                    developerConnection = 'scm:git:https://github.com/mapsforge/mapsforge'
+                    url = 'https://github.com/mapsforge/mapsforge'
+                }
             }
         }
     }
+    repositories {
+        maven {
+            def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+            def snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            credentials {
+                username = SONATYPE_USERNAME
+                password = SONATYPE_PASSWORD
+            }
+        }
+    }
+}
+
+signing {
+    required { !version.endsWith('SNAPSHOT') }
+    sign publishing.publications.maven
+}
+
+javadoc {
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
 }
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 As an open source project, we welcome new contributors and appreciate your help.
 
-Before you start working on an unresolved issue or try to implement a new feature, please contact us via the Discussions. We will then discuss the best way to realize your proposal and figure out how we can help you to get started quickly.
+Before you start working on an unresolved issue or try to implement a new feature, please contact us via the forum. We will then discuss the best way to realize your proposal and figure out how we can help you to get started quickly.
 
 If you are only requesting a small change in the code, you may attach a patch file to the corresponding issue, but it is best to create a pull request on Github. Make sure that your patch is derived from the latest version in our **master** repository, otherwise we might be unable to apply it. Important is to keep pull requests simple with one feature in each. Please follow our code and style conventions.