Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #315 from afischerdev/migrate-to-android11

Browse source 
Migrate to gradle part 3
This commit is contained in:
afischerdev 2021-07-01 12:55:36 +02:00 committed by GitHub
commit e8970c8626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -46,10 +46,10 @@ A full documentation on how to set this up is available at
### Build and Install ### 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=<your/android/sdk/path>
``` ```

1
brouter-map-creator/build.gradle
View file

@ -2,7 +2,6 @@ plugins {
id 'application' id 'application'
} }
version = '1.6.1'
application { application {
// Gradles 'application' plugin requires one main class; since we have multiple ones, just specify // Gradles 'application' plugin requires one main class; since we have multiple ones, just specify

2
brouter-routing-app/build.gradle
View file

@ -11,7 +11,7 @@ android {
targetSdkVersion 30 targetSdkVersion 30
versionCode 41 versionCode 41
versionName "1.6.1" versionName version
setProperty("archivesBaseName","BRouterApp." + defaultConfig.versionName) setProperty("archivesBaseName","BRouterApp." + defaultConfig.versionName)

1
brouter-server/build.gradle
View file

@ -2,7 +2,6 @@ plugins {
id 'application' id 'application'
} }
version = '1.6.1'
application { application {
mainClass.set('btools.server.BRouter') mainClass.set('btools.server.BRouter')

6
build.gradle
View file

@ -1,5 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
@ -16,6 +20,8 @@ buildscript {
} }
allprojects { allprojects {
version "1.6.1"
repositories { repositories {
mavenCentral() mavenCentral()
google() google()

7
settings.gradle
View file

@ -1,2 +1,7 @@
rootProject.name='brouter' rootProject.name='brouter'
include ':brouter-routing-app', ':brouter-mapaccess', ':brouter-core', ':brouter-util', ':brouter-expressions', ':brouter-codec', ':brouter-map-creator', ':brouter-server' 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'