From ead951d1492f2b658432b69ab6c7e21b17d4bbae Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 18 Jul 2023 11:01:04 +0200 Subject: [PATCH 1/4] change java version in git actions --- .github/workflows/gradle-publish.yml | 4 ++-- .github/workflows/gradle.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 8ac8cf622..a1d281b66 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -24,7 +24,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: '11' - distribution: 'adopt' + distribution: 'temurin' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file @@ -38,7 +38,7 @@ jobs: ORG_GRADLE_PROJECT_RELEASE_STORE_FILE: ${{ secrets.BROUTER_KEYSTORE_FILE }} ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }} ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }} - ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} + ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} run: gradle build # The USERNAME and TOKEN need to correspond to the credentials environment variables used in diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c2c9b863b..39fdb4eba 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: '11' - distribution: 'zulu' + distribution: 'temurin' cache: gradle - name: Create local.properties run: touch local.properties From 3eed1e18c867de7556f8d7768b43f4ac6310b370 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 18 Jul 2023 12:30:58 +0200 Subject: [PATCH 2/4] add manual start, add Android bundle --- .github/workflows/gradle-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index a1d281b66..3e376a52f 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -4,7 +4,7 @@ name: Gradle Package on: - + workflow_dispatch: release: types: [created] @@ -39,7 +39,7 @@ jobs: ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }} ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }} ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} - run: gradle build + run: gradle build bundle # The USERNAME and TOKEN need to correspond to the credentials environment variables used in # the publishing section of your build.gradle From ab60c442de62fe1518d511ac0028f01680a92147 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 18 Jul 2023 12:45:52 +0200 Subject: [PATCH 3/4] add doc for new version --- docs/revisions.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/revisions.md b/docs/revisions.md index 3c6e3cf8a..d2160dee4 100644 --- a/docs/revisions.md +++ b/docs/revisions.md @@ -2,7 +2,13 @@ (ZIP-Archives including APK, readme + profiles) -### [brouter-1.7.1.zip](../brouter_bin/brouter-1.7.1.zip) (current revision, 12.07.2023) +### [brouter-1.7.2.zip](../brouter_bin/brouter-1.7.2.zip) (current revision, 19.07.2023) + +- Re-index Json output + Note: This is different to releases 1.7.0 and 1.7.1. It is recommended to use the current version to avoid breaks in voice hint output for GeoJson. + + +### [brouter-1.7.1.zip](../brouter_bin/brouter-1.7.1.zip) (12.07.2023) Android From f14b8795ea04d6eb9a991363558a3a6952d82cd6 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 18 Jul 2023 12:53:27 +0200 Subject: [PATCH 4/4] change new version number and date --- brouter-core/src/main/java/btools/router/OsmTrack.java | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 5c69443b5..684b3556b 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -36,8 +36,8 @@ import btools.util.StringUtils; public final class OsmTrack { - final public static String version = "1.7.2-beta-1"; - final public static String versionDate = "12072023+"; + final public static String version = "1.7.2"; + final public static String versionDate = "19072023"; // csv-header-line private static final String MESSAGES_HEADER = "Longitude\tLatitude\tElevation\tDistance\tCostPerKm\tElevCost\tTurnCost\tNodeCost\tInitialCost\tWayTags\tNodeTags\tTime\tEnergy"; diff --git a/build.gradle b/build.gradle index bedc99d80..0be4859a9 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { // app: build.gradle (versionCode only) // OsmTrack (version and versionDate) // docs revisions.md (version and versionDate) - project.version "1.7.2-beta-1" + project.version "1.7.2" group 'org.btools' repositories {