From 03574f834c160b5bb66a2212b3632081584797ba Mon Sep 17 00:00:00 2001 From: afischerdev Date: Wed, 7 Jul 2021 12:21:52 +0200 Subject: [PATCH] more on version code --- .../src/main/java/btools/router/OsmTrack.java | 7 +++++-- brouter-map-creator/build.gradle | 15 ++++++++++++++- brouter-routing-app/build.gradle | 4 ++-- brouter-server/build.gradle | 14 +++++++++++++- .../src/main/java/btools/server/BRouter.java | 3 ++- .../src/main/java/btools/server/RouteServer.java | 2 +- build.gradle | 8 +++----- 7 files changed, 40 insertions(+), 13 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index ca18f99..f836b4b 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -33,6 +33,9 @@ import btools.util.StringUtils; public final class OsmTrack { + final public static String version = "1.6.1"; + final public static String versionDate = "01032020"; + // csv-header-line private static final String MESSAGES_HEADER = "Longitude\tLatitude\tElevation\tDistance\tCostPerKm\tElevCost\tTurnCost\tNodeCost\tInitialCost\tWayTags\tNodeTags\tTime\tEnergy"; @@ -444,7 +447,7 @@ public final class OsmTrack } else { - sb.append( " creator=\"BRouter-1.6.1\" version=\"1.1\">\n" ); + sb.append( " creator=\"BRouter-" + version + "\" version=\"1.1\">\n" ); } if ( turnInstructionMode == 3) // osmand style @@ -732,7 +735,7 @@ public final class OsmTrack sb.append( " {\n" ); sb.append( " \"type\": \"Feature\",\n" ); sb.append( " \"properties\": {\n" ); - sb.append( " \"creator\": \"BRouter-1.1\",\n" ); + sb.append( " \"creator\": \"BRouter-" + version + "\",\n" ); sb.append( " \"name\": \"" ).append( name ).append( "\",\n" ); sb.append( " \"track-length\": \"" ).append( distance ).append( "\",\n" ); sb.append( " \"filtered ascend\": \"" ).append( ascend ).append( "\",\n" ); diff --git a/brouter-map-creator/build.gradle b/brouter-map-creator/build.gradle index a675f7e..f2664f9 100644 --- a/brouter-map-creator/build.gradle +++ b/brouter-map-creator/build.gradle @@ -10,10 +10,23 @@ application { jar { manifest { - attributes "Main-Class": getMainClass() + attributes "Main-Class": getMainClass(), "Implementation-Version": project.version } } + task fatJar(type: Jar) { + manifest.from jar.manifest + classifier = 'all' + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } { + exclude "META-INF/*.SF" + exclude "META-INF/*.DSA" + exclude "META-INF/*.RSA" + } + with jar + } + } dependencies { diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle index c16cf8d..677ed19 100644 --- a/brouter-routing-app/build.gradle +++ b/brouter-routing-app/build.gradle @@ -11,11 +11,11 @@ android { targetSdkVersion 30 versionCode 41 - versionName version + versionName project.version + resValue('string', 'app_version', defaultConfig.versionName) setProperty("archivesBaseName","BRouterApp." + defaultConfig.versionName) - //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } if(project.hasProperty("RELEASE_STORE_FILE")) { diff --git a/brouter-server/build.gradle b/brouter-server/build.gradle index 2cb1de6..14693a8 100644 --- a/brouter-server/build.gradle +++ b/brouter-server/build.gradle @@ -8,9 +8,21 @@ application { jar { manifest { - attributes "Main-Class": getMainClass() + attributes "Main-Class": getMainClass(), "Implementation-Version": project.version } } + task fatJar(type: Jar) { + manifest.from jar.manifest + classifier = 'all' + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } { + exclude "META-INF/*.SF" + exclude "META-INF/*.DSA" + exclude "META-INF/*.RSA" + } + with jar + } } dependencies { diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index ea340b8..ba6a0e6 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -9,6 +9,7 @@ import java.util.List; import java.io.File; import btools.router.OsmNodeNamed; +import btools.router.OsmTrack; import btools.router.RoutingContext; import btools.router.RoutingEngine; import btools.router.SearchBoundary; @@ -89,7 +90,7 @@ public class BRouter } System.exit(0); } - System.out.println("BRouter 1.6.1 / 01032020"); + System.out.println("BRouter "+ OsmTrack.version + " / " + OsmTrack.versionDate); if ( args.length < 6 ) { System.out.println("Find routes in an OSM map"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 93eb041..a0f81ba 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -327,7 +327,7 @@ public class RouteServer extends Thread implements Comparable public static void main(String[] args) throws Exception { - System.out.println("BRouter 1.6.1 / 01032020"); + System.out.println("BRouter " + OsmTrack.version + " / " + OsmTrack.versionDate); if ( args.length != 5 && args.length != 6) { System.out.println("serve BRouter protocol"); diff --git a/build.gradle b/build.gradle index 74a5190..689084e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - - - buildscript { repositories { @@ -11,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:4.2.2' // NOTE: Do not place your application dependencies here; they belong @@ -20,12 +17,13 @@ buildscript { } allprojects { - version "1.6.1" + project.version "1.6.1" repositories { mavenCentral() google() } + } task clean(type: Delete) {