xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gradle 4 and Android plugin 3, fix #433

Browse Source
This commit is contained in:
Emux
2017-10-27 11:54:45 +03:00
parent df5bcd583f
commit cbdeb58c2f
27 changed files with 228 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -7,8 +7,8 @@ android:
- tools - tools
- platform-tools - platform-tools
- tools - tools
- build-tools-26.0.2 - build-tools-27.0.0
- android-26 - android-27
env: env:
global: global:
- GRADLE_OPTS="-Xmx2048m" - GRADLE_OPTS="-Xmx2048m"

17
build.gradle
View File

@@ -1,10 +1,11 @@
buildscript { buildscript {
repositories { repositories {
google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
} }
} }
@@ -13,7 +14,7 @@ allprojects {
version = 'master-SNAPSHOT' version = 'master-SNAPSHOT'
ext.isReleaseVersion = !version.endsWith("SNAPSHOT") ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
ext.androidBuildVersionTools = "26.0.2" ext.androidBuildVersionTools = "27.0.0"
ext.gdxVersion = "1.9.6" ext.gdxVersion = "1.9.6"
ext.gwtVersion = "2.8.0" ext.gwtVersion = "2.8.0"
ext.slf4jVersion = "1.7.25" ext.slf4jVersion = "1.7.25"
@@ -27,22 +28,22 @@ allprojects {
} }
} }
def androidCompileSdk() { return 26 } static def androidCompileSdk() { return 27 }
// Minimum API Level by Support Library // Minimum API Level by Support Library
def androidMinSdk() { return 14 } static def androidMinSdk() { return 14 }
def androidTargetSdk() { return 22 } static def androidTargetSdk() { return 22 }
def versionCode() { return 50 } static def versionCode() { return 1 }
def versionName() { return version } def versionName() { return version }
subprojects { subprojects {
repositories { repositories {
google()
maven { url 'https://repo.boundlessgeo.com/main' } maven { url 'https://repo.boundlessgeo.com/main' }
jcenter() jcenter()
maven { url 'https://maven.google.com' }
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

1
docs/Changelog.md
View File

@@ -21,6 +21,7 @@
- PolyLabel default disabled [#402](https://github.com/mapsforge/vtm/issues/402) - PolyLabel default disabled [#402](https://github.com/mapsforge/vtm/issues/402)
- vtm-theme-comparator module [#387](https://github.com/mapsforge/vtm/issues/387) - vtm-theme-comparator module [#387](https://github.com/mapsforge/vtm/issues/387)
- Feature parameters [#403](https://github.com/mapsforge/vtm/issues/403) - Feature parameters [#403](https://github.com/mapsforge/vtm/issues/403)
- Gradle 4 / Android plugin 3 support [#433](https://github.com/mapsforge/vtm/issues/433)
- Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41) - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41)
- Many other minor improvements and bug fixes - Many other minor improvements and bug fixes
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.9.0) - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.9.0)

84
docs/Integration.md
View File

@@ -8,42 +8,42 @@ Current version is [![Maven Central](https://img.shields.io/maven-central/v/org.
### Core ### Core
```groovy ```groovy
compile 'org.mapsforge:vtm:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-themes:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-themes:[CURRENT-VERSION]'
compile 'org.slf4j:slf4j-api:1.7.25' implementation 'org.slf4j:slf4j-api:1.7.25'
``` ```
### Android ### Android
```groovy ```groovy
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-mips' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-mips'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-mips64' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-mips64'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
compile 'com.caverock:androidsvg:1.2.2-beta-1' implementation 'com.caverock:androidsvg:1.2.2-beta-1'
``` ```
### Android (with libGDX) ### Android (with libGDX)
```groovy ```groovy
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
compile 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64' implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
compile 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a'
compile 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi'
compile 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a'
compile 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
compile 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
compile 'com.badlogicgames.gdx:gdx:1.9.6' implementation 'com.badlogicgames.gdx:gdx:1.9.6'
compile 'com.badlogicgames.gdx:gdx-backend-android:1.9.6' implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.6'
compile 'com.caverock:androidsvg:1.2.2-beta-1' implementation 'com.caverock:androidsvg:1.2.2-beta-1'
``` ```
### iOS ### iOS
@@ -52,19 +52,19 @@ Detailed iOS instructions can be found [here](ios.md).
### Desktop ### Desktop
```groovy ```groovy
compile 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]'
compile 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-linux' implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-linux'
compile 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx' implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx'
compile 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows' implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
compile 'com.badlogicgames.gdx:gdx:1.9.6' implementation 'com.badlogicgames.gdx:gdx:1.9.6'
compile 'com.badlogicgames.gdx:gdx-platform:1.9.6:natives-desktop' implementation 'com.badlogicgames.gdx:gdx-platform:1.9.6:natives-desktop'
compile 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.6' implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.6'
compile 'org.lwjgl.lwjgl:lwjgl:2.9.3' implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3'
compile 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux'
compile 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx'
compile 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-windows' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-windows'
compile 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19' implementation 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19'
``` ```
## Snapshots ## Snapshots
@@ -80,7 +80,7 @@ repositories {
And declare the dependencies like: And declare the dependencies like:
```groovy ```groovy
compile 'org.mapsforge:vtm:master-SNAPSHOT' implementation 'org.mapsforge:vtm:master-SNAPSHOT'
... ...
``` ```

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Fri Mar 03 12:50:23 EET 2017 #Thu Oct 26 11:57:58 EEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

4
jni/build.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'java' apply plugin: 'java-library'
dependencies { dependencies {
compile "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion"
} }
sourceSets { sourceSets {

39
vtm-android-example/build.gradle
View File

@@ -5,24 +5,33 @@ repositories {
} }
dependencies { dependencies {
compile project(':vtm-android') implementation project(':vtm-android')
compile project(':vtm-http') implementation project(':vtm-http')
compile(project(':vtm-jeo')) { implementation(project(':vtm-jeo')) {
exclude group: 'com.vividsolutions', module: 'jts' exclude group: 'com.vividsolutions', module: 'jts'
} }
compile project(':vtm-json') implementation project(':vtm-json')
compile project(':vtm-jts') implementation project(':vtm-jts')
compile project(':vtm-themes') implementation project(':vtm-themes')
compile 'com.noveogroup.android:android-logger:1.3.6' implementation 'com.noveogroup.android:android-logger:1.3.6'
compile 'com.android.support:support-v4:26.1.0' implementation 'com.vividsolutions:jts-core:1.14.0'
implementation('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'com.vividsolutions', module: 'jts'
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
implementation('org.jeo:jeo-render:0-SNAPSHOT') {
exclude group: 'com.vividsolutions', module: 'jts'
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
implementation 'com.android.support:support-v4:27.0.0'
compile 'org.mapsforge:mapsforge-core:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-core:master-SNAPSHOT'
compile 'org.mapsforge:mapsforge-poi:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-poi:master-SNAPSHOT'
compile 'org.mapsforge:mapsforge-poi-android:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-poi-android:master-SNAPSHOT'
compile 'org.mapsforge:spatialite-android:master-SNAPSHOT' implementation 'org.mapsforge:spatialite-android:master-SNAPSHOT'
compile 'org.mapsforge:spatialite-android:master-SNAPSHOT:natives-armeabi' implementation 'org.mapsforge:spatialite-android:master-SNAPSHOT:natives-armeabi'
compile 'org.mapsforge:spatialite-android:master-SNAPSHOT:natives-armeabi-v7a' implementation 'org.mapsforge:spatialite-android:master-SNAPSHOT:natives-armeabi-v7a'
compile 'org.mapsforge:spatialite-android:master-SNAPSHOT:natives-x86' implementation 'org.mapsforge:spatialite-android:master-SNAPSHOT:natives-x86'
} }
android { android {

34
vtm-android-gdx/build.gradle
View File

@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.github.dcendents.android-maven'
dependencies { dependencies {
compile project(':vtm-android') api project(':vtm-android')
compile project(':vtm-gdx') api project(':vtm-gdx')
compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
compile 'com.noveogroup.android:android-logger:1.3.6' runtimeOnly 'com.noveogroup.android:android-logger:1.3.6'
} }
android { android {
@@ -47,35 +47,21 @@ android {
android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
def name = variant.buildType.name def name = variant.buildType.name
if (name.equals("debug")) { if (name == "debug")
print "Skipping debug jar" return
return; // Skip debug builds.
}
def jar = project.tasks.create "jar${name.capitalize()}", Jar def jar = project.tasks.create "jar${name.capitalize()}", Jar
jar.dependsOn variant.javaCompile jar.dependsOn variant.javaCompiler
jar.from variant.javaCompile.destinationDir jar.from variant.javaCompiler.destinationDir
jar.exclude 'android-logger.properties' jar.exclude 'android-logger.properties'
artifacts.add('archives', jar); artifacts.add('archives', jar)
file('natives').eachDir() { dir -> file('natives').eachDir() { dir ->
def nativesJar = project.tasks.create "nativesJar${name.capitalize()}-${dir.name}", Jar def nativesJar = project.tasks.create "nativesJar${name.capitalize()}-${dir.name}", Jar
nativesJar.classifier = "natives-${dir.name}" nativesJar.classifier = "natives-${dir.name}"
nativesJar.from(dir.path) nativesJar.from(dir.path)
artifacts.add('archives', nativesJar); artifacts.add('archives', nativesJar)
} }
def fatJar = project.tasks.create "fatJar${name.capitalize()}", Jar
fatJar.classifier = 'jar-with-dependencies'
fatJar.dependsOn variant.javaCompile
fatJar.from variant.javaCompile.destinationDir
fatJar.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
file('natives').eachDir() { dir ->
fatJar.from(dir.path)
fatJar.from("${rootProject.projectDir}/vtm-android/natives/${dir.name}")
}
fatJar.exclude 'android-logger.properties'
artifacts.add('archives', fatJar);
} }
afterEvaluate { afterEvaluate {

29
vtm-android/build.gradle
View File

@@ -2,8 +2,9 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.github.dcendents.android-maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile 'com.caverock:androidsvg:1.2.2-beta-1' implementation 'com.caverock:androidsvg:1.2.2-beta-1'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
android { android {
@@ -39,32 +40,20 @@ android {
android.libraryVariants.all { variant -> android.libraryVariants.all { variant ->
def name = variant.buildType.name def name = variant.buildType.name
if (name.equals("debug")) { if (name == "debug")
print "Skipping debug jar" return
return; // Skip debug builds.
}
def jar = project.tasks.create "jar${name.capitalize()}", Jar def jar = project.tasks.create "jar${name.capitalize()}", Jar
jar.dependsOn variant.javaCompile jar.dependsOn variant.javaCompiler
jar.from variant.javaCompile.destinationDir jar.from variant.javaCompiler.destinationDir
artifacts.add('archives', jar); artifacts.add('archives', jar)
file('natives').eachDir() { dir -> file('natives').eachDir() { dir ->
def nativesJar = project.tasks.create "nativesJar${name.capitalize()}-${dir.name}", Jar def nativesJar = project.tasks.create "nativesJar${name.capitalize()}-${dir.name}", Jar
nativesJar.classifier = "natives-${dir.name}" nativesJar.classifier = "natives-${dir.name}"
nativesJar.from(dir.path) nativesJar.from(dir.path)
artifacts.add('archives', nativesJar); artifacts.add('archives', nativesJar)
} }
def fatJar = project.tasks.create "fatJar${name.capitalize()}", Jar
fatJar.classifier = 'jar-with-dependencies'
fatJar.dependsOn variant.javaCompile
fatJar.from variant.javaCompile.destinationDir
fatJar.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
file('natives').eachDir() { dir ->
fatJar.from(dir.path)
}
artifacts.add('archives', fatJar);
} }
if (project.hasProperty("SONATYPE_USERNAME")) { if (project.hasProperty("SONATYPE_USERNAME")) {

10
vtm-app/build.gradle
View File

@@ -1,11 +1,11 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
dependencies { dependencies {
compile project(':vtm-android') implementation project(':vtm-android')
compile project(':vtm-themes') implementation project(':vtm-themes')
compile project(':vtm-extras') implementation project(':vtm-extras')
compile 'com.noveogroup.android:android-logger:1.3.6' implementation 'com.noveogroup.android:android-logger:1.3.6'
compile 'com.squareup.okhttp3:okhttp:3.8.0' implementation 'com.squareup.okhttp3:okhttp:3.8.0'
} }
android { android {

28
vtm-desktop/build.gradle
View File

@@ -1,14 +1,15 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm-gdx') api project(':vtm-gdx')
file('natives').eachDir() { dir -> file('natives').eachDir() { dir ->
compile files(dir.path) api files(dir.path)
} }
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
compile 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19' implementation 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
sourceSets { sourceSets {
@@ -28,21 +29,6 @@ file('natives').eachDir() { dir ->
} }
} }
task fatJar(type: Jar, dependsOn: classes) {
classifier = 'jar-with-dependencies'
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
// Natives come from compile configuration
/*file('natives').eachDir() { dir ->
fatJar.from(dir.path)
}*/
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
with jar
}
artifacts {
archives fatJar
}
if (project.hasProperty("SONATYPE_USERNAME")) { if (project.hasProperty("SONATYPE_USERNAME")) {
afterEvaluate { afterEvaluate {
project.apply from: "${rootProject.projectDir}/deploy.gradle" project.apply from: "${rootProject.projectDir}/deploy.gradle"

13
vtm-extras/build.gradle
View File

@@ -1,12 +1,13 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile 'com.fasterxml.jackson.core:jackson-core:2.8.4' implementation 'com.fasterxml.jackson.core:jackson-core:2.8.4'
compile 'com.google.protobuf:protobuf-java:2.6.1' implementation 'com.google.protobuf:protobuf-java:2.6.1'
compile 'com.vividsolutions:jts-core:1.14.0' implementation 'com.vividsolutions:jts-core:1.14.0'
compile 'org.openstreetmap.osmosis:osmosis-osm-binary:0.45' implementation 'org.openstreetmap.osmosis:osmosis-osm-binary:0.45'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
sourceSets { sourceSets {

9
vtm-gdx/build.gradle
View File

@@ -1,10 +1,11 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile project(':vtm-themes') api project(':vtm-themes')
compile "com.badlogicgames.gdx:gdx:$gdxVersion" implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
sourceSets { sourceSets {

7
vtm-http/build.gradle
View File

@@ -1,9 +1,10 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile 'com.squareup.okhttp3:okhttp:3.8.0' implementation 'com.squareup.okhttp3:okhttp:3.8.0'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
sourceSets { sourceSets {

18
vtm-ios-example/build.gradle
View File

@@ -25,15 +25,15 @@ launchIOSDevice.dependsOn build
createIPA.dependsOn build createIPA.dependsOn build
dependencies { dependencies {
compile project(':vtm') implementation project(':vtm')
compile project(':vtm-gdx') implementation project(':vtm-gdx')
compile project(':vtm-jts') implementation project(':vtm-jts')
compile project(':vtm-ios') implementation project(':vtm-ios')
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" implementation "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" implementation "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
compile "org.slf4j:slf4j-simple:$slf4jVersion" implementation "org.slf4j:slf4j-simple:$slf4jVersion"
} }
task copyVtmResources(type: Copy) { task copyVtmResources(type: Copy) {

22
vtm-ios/build.gradle
View File

@@ -8,7 +8,7 @@ buildscript {
} }
} }
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'robovm' apply plugin: 'robovm'
@@ -26,11 +26,12 @@ launchIOSDevice.dependsOn build
createIPA.dependsOn build createIPA.dependsOn build
dependencies { dependencies {
compile project(':vtm-gdx') api project(':vtm-gdx')
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" implementation "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" implementation "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
task copyVtmResources(type: Copy) { task copyVtmResources(type: Copy) {
@@ -57,17 +58,8 @@ task nativesJar(type: Jar) {
from('natives') from('natives')
} }
task fatJar(type: Jar, dependsOn: classes) {
classifier = 'jar-with-dependencies'
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
from('natives')
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
with jar
}
artifacts { artifacts {
archives nativesJar archives nativesJar
//archives fatJar
} }
if (project.hasProperty("SONATYPE_USERNAME")) { if (project.hasProperty("SONATYPE_USERNAME")) {

8
vtm-jeo/build.gradle
View File

@@ -1,12 +1,12 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile('org.jeo:jeo:0-SNAPSHOT') { implementation('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14' exclude group: 'org.slf4j', module: 'slf4j-jdk14'
} }
compile('org.jeo:jeo-carto:0-SNAPSHOT') { implementation('org.jeo:jeo-carto:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14' exclude group: 'org.slf4j', module: 'slf4j-jdk14'
} }
} }

6
vtm-json/build.gradle
View File

@@ -1,9 +1,9 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile 'com.fasterxml.jackson.core:jackson-core:2.8.4' implementation 'com.fasterxml.jackson.core:jackson-core:2.8.4'
} }
sourceSets { sourceSets {

7
vtm-jts/build.gradle
View File

@@ -1,9 +1,10 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
compile 'com.vividsolutions:jts-core:1.14.0' implementation 'com.vividsolutions:jts-core:1.14.0'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
} }
sourceSets { sourceSets {

36
vtm-playground/build.gradle
View File

@@ -1,13 +1,26 @@
apply plugin: 'java' apply plugin: 'application'
dependencies { dependencies {
compile project(':vtm-desktop') implementation project(':vtm-desktop')
compile project(':vtm-extras') implementation project(':vtm-extras')
compile project(':vtm-http') implementation project(':vtm-http')
compile project(':vtm-jeo') implementation(project(':vtm-jeo')) {
compile project(':vtm-json') exclude group: 'com.vividsolutions', module: 'jts'
compile project(':vtm-jts') }
compile "org.slf4j:slf4j-simple:$slf4jVersion" implementation project(':vtm-json')
implementation project(':vtm-jts')
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
implementation 'com.squareup.okhttp3:okhttp:3.8.0'
implementation('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'com.vividsolutions', module: 'jts'
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
implementation('org.jeo:jeo-render:0-SNAPSHOT') {
exclude group: 'com.vividsolutions', module: 'jts'
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
implementation "org.slf4j:slf4j-simple:$slf4jVersion"
} }
sourceSets { sourceSets {
@@ -16,3 +29,10 @@ sourceSets {
resources.srcDirs = ['resources'] resources.srcDirs = ['resources']
} }
} }
mainClassName = "org.oscim.test.MapsforgeMultiTest"
run {
if (project.hasProperty("args")) {
args project.getProperty("args").split(",")
}
}

14
vtm-tests/build.gradle
View File

@@ -1,13 +1,13 @@
apply plugin: 'java' apply plugin: 'java'
dependencies { dependencies {
compile project(':vtm-http') implementation project(':vtm-http')
compile 'com.squareup.okhttp3:okhttp:3.8.0' implementation 'com.squareup.okhttp3:okhttp:3.8.0'
testCompile 'com.squareup.okhttp3:mockwebserver:3.8.0' testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.0'
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testCompile 'org.easytesting:fest-assert-core:2.0M10' testImplementation 'org.easytesting:fest-assert-core:2.0M10'
testCompile 'org.mockito:mockito-all:1.10.19' testImplementation 'org.mockito:mockito-all:1.10.19'
testCompile "org.slf4j:slf4j-simple:$slf4jVersion" testImplementation "org.slf4j:slf4j-simple:$slf4jVersion"
} }
sourceSets { sourceSets {

28
vtm-theme-comparator/build.gradle
View File

@@ -1,21 +1,23 @@
apply plugin: 'java' apply plugin: 'application'
repositories { repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
} }
dependencies { dependencies {
compile project(':vtm-desktop') implementation project(':vtm-desktop')
compile 'ch.qos.logback:logback-classic:1.2.3' implementation 'ch.qos.logback:logback-classic:1.2.3'
compile 'com.fifesoft:rsyntaxtextarea:2.6.1' implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
compile 'com.jtattoo:JTattoo:1.6.11' implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
implementation 'com.fifesoft:rsyntaxtextarea:2.6.1'
implementation 'com.jtattoo:JTattoo:1.6.11'
compile 'org.mapsforge:mapsforge-core:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-core:master-SNAPSHOT'
compile 'org.mapsforge:mapsforge-map:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-map:master-SNAPSHOT'
compile("org.mapsforge:mapsforge-map-awt:master-SNAPSHOT") implementation 'org.mapsforge:mapsforge-map-awt:master-SNAPSHOT'
compile 'org.mapsforge:mapsforge-map-reader:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-map-reader:master-SNAPSHOT'
compile 'org.mapsforge:mapsforge-themes:master-SNAPSHOT' implementation 'org.mapsforge:mapsforge-themes:master-SNAPSHOT'
compile 'net.sf.kxml:kxml2:2.3.0' implementation 'net.sf.kxml:kxml2:2.3.0'
} }
sourceSets { sourceSets {
@@ -27,10 +29,12 @@ sourceSets {
task fatJar(type: Jar, dependsOn: classes) { task fatJar(type: Jar, dependsOn: classes) {
classifier = 'jar-with-dependencies' classifier = 'jar-with-dependencies'
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF' exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
manifest { manifest {
attributes('Main-Class': 'org.oscim.theme.comparator.Main') attributes('Main-Class': 'org.oscim.theme.comparator.Main')
} }
with jar with jar
} }
mainClassName = "org.oscim.theme.comparator.Main"

4
vtm-themes/build.gradle
View File

@@ -1,8 +1,8 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile project(':vtm') api project(':vtm')
} }
sourceSets { sourceSets {

6
vtm-web-app/build.gradle
View File

@@ -42,9 +42,9 @@ gwt {
noPrecompile = true noPrecompile = true
} }
compiler { compiler {
enableClosureCompiler = false; // activates -XenableClosureCompiler enableClosureCompiler = false // activates -XenableClosureCompiler
disableClassMetadata = true; // activates -XdisableClassMetadata disableClassMetadata = true // activates -XdisableClassMetadata
disableCastChecking = true; // activates -XdisableCastChecking disableCastChecking = true // activates -XdisableCastChecking
} }
src += files(sourceSets.main.java.srcDirs) src += files(sourceSets.main.java.srcDirs)

6
vtm-web-js/build.gradle
View File

@@ -44,9 +44,9 @@ gwt {
noPrecompile = true noPrecompile = true
} }
compiler { compiler {
enableClosureCompiler = false; // activates -XenableClosureCompiler enableClosureCompiler = false // activates -XenableClosureCompiler
disableClassMetadata = true; // activates -XdisableClassMetadata disableClassMetadata = true // activates -XdisableClassMetadata
disableCastChecking = true; // activates -XdisableCastChecking disableCastChecking = true // activates -XdisableCastChecking
} }
src += files(sourceSets.main.java.srcDirs) src += files(sourceSets.main.java.srcDirs)

22
vtm-web/build.gradle
View File

@@ -7,7 +7,7 @@ buildscript {
} }
} }
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'gwt-base' apply plugin: 'gwt-base'
@@ -16,13 +16,13 @@ sourceSets {
} }
dependencies { dependencies {
compile project(':vtm-gdx') api project(':vtm-gdx')
compile project(':vtm-extras') api project(':vtm-extras')
compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources" implementation "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources" implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion" implementation "org.slf4j:slf4j-api:$slf4jVersion"
compile 'ru.finam:slf4j-gwt:1.7.7.1' implementation 'ru.finam:slf4j-gwt:1.7.7.1'
} }
// explicit dependencies for org.gradle.configureondemand=true // explicit dependencies for org.gradle.configureondemand=true
@@ -39,9 +39,9 @@ gwt {
noPrecompile = true noPrecompile = true
} }
compiler { compiler {
enableClosureCompiler = false; // activates -XenableClosureCompiler enableClosureCompiler = false // activates -XenableClosureCompiler
disableClassMetadata = true; // activates -XdisableClassMetadata disableClassMetadata = true // activates -XdisableClassMetadata
disableCastChecking = true; // activates -XdisableCastChecking disableCastChecking = true // activates -XdisableCastChecking
} }
src += files(sourceSets.main.java.srcDirs) src += files(sourceSets.main.java.srcDirs)

4
vtm/build.gradle
View File

@@ -1,8 +1,8 @@
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'maven' apply plugin: 'maven'
dependencies { dependencies {
compile "org.slf4j:slf4j-api:$slf4jVersion" implementation "org.slf4j:slf4j-api:$slf4jVersion"
compileOnly 'com.google.code.findbugs:jsr305:3.0.1' compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
} }