diff --git a/README.md b/README.md index 61843fc..60052ca 100644 --- a/README.md +++ b/README.md @@ -46,10 +46,10 @@ A full documentation on how to set this up is available at ### Build and Install -To compile BRouter (including the BRouter Android app), add a file 'local.properties' to main folder with your Android path (Windows sample) +To compile BRouter including the BRouter Android app, add a file 'local.properties' to main folder with your Android path ``` -sdk.dir=D\:\\Android\\android-sdk +sdk.dir= ``` diff --git a/brouter-map-creator/build.gradle b/brouter-map-creator/build.gradle index 530e277..a675f7e 100644 --- a/brouter-map-creator/build.gradle +++ b/brouter-map-creator/build.gradle @@ -2,7 +2,6 @@ plugins { id 'application' } -version = '1.6.1' application { // Gradles 'application' plugin requires one main class; since we have multiple ones, just specify diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle index 4ee2104..c16cf8d 100644 --- a/brouter-routing-app/build.gradle +++ b/brouter-routing-app/build.gradle @@ -11,7 +11,7 @@ android { targetSdkVersion 30 versionCode 41 - versionName "1.6.1" + versionName version setProperty("archivesBaseName","BRouterApp." + defaultConfig.versionName) diff --git a/brouter-server/build.gradle b/brouter-server/build.gradle index 868dfc4..2cb1de6 100644 --- a/brouter-server/build.gradle +++ b/brouter-server/build.gradle @@ -2,7 +2,6 @@ plugins { id 'application' } -version = '1.6.1' application { mainClass.set('btools.server.BRouter') diff --git a/build.gradle b/build.gradle index 5315d26..74a5190 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. + + + + buildscript { - + repositories { mavenCentral() google() @@ -16,6 +20,8 @@ buildscript { } allprojects { + version "1.6.1" + repositories { mavenCentral() google() diff --git a/settings.gradle b/settings.gradle index 604b15f..eaa63a4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,7 @@ rootProject.name='brouter' -include ':brouter-routing-app', ':brouter-mapaccess', ':brouter-core', ':brouter-util', ':brouter-expressions', ':brouter-codec', ':brouter-map-creator', ':brouter-server' \ No newline at end of file +if (file('local.properties').exists()) { + include ':brouter-routing-app' +} else { + println "Note: To include Android app add 'local.properties' with 'sdk.dir=...' " +} +include ':brouter-mapaccess', ':brouter-core', ':brouter-util', ':brouter-expressions', ':brouter-codec', ':brouter-map-creator', ':brouter-server' \ No newline at end of file