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

Gradle 4 / Android plugin 3 transitive dependencies, fix #433

Browse Source
This commit is contained in:
Emux 2018-01-02 13:27:54 +02:00
parent 791f054f70
commit a67b2f2c91
No known key found for this signature in database
GPG Key ID: 89C6921D7AF2BDD0
22 changed files with 33 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Changelog.md
View File

@ -2,6 +2,7 @@
## New since 0.9.1
- Gradle fix transitive dependencies [#433](https://github.com/mapsforge/vtm/issues/433)
- libGDX 1.9.8 [#464](https://github.com/mapsforge/vtm/issues/464)
- Many other minor improvements and bug fixes
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.10.0)

2
jni/build.gradle
View File

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

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

@ -11,12 +11,6 @@ dependencies {
implementation project(':vtm-json')
implementation project(':vtm-jts')
implementation project(':vtm-themes')
implementation('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
implementation('org.jeo:jeo-render:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
implementation "org.slf4j:slf4j-android:$slf4jVersion"
implementation project(':vtm-android-gdx')

3
vtm-android/build.gradle
View File

@ -3,8 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven'
dependencies {
api project(':vtm')
implementation 'com.caverock:androidsvg:1.2.2-beta-1'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
api 'com.caverock:androidsvg:1.2.2-beta-1'
}
android {

2
vtm-app/build.gradle
View File

@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
dependencies {
implementation project(':vtm-android')
implementation project(':vtm-themes')
implementation project(':vtm-extras')
implementation project(':vtm-themes')
implementation 'com.squareup.okhttp3:okhttp:3.8.0'
implementation "org.slf4j:slf4j-android:$slf4jVersion"
}

9
vtm-desktop/build.gradle
View File

@ -3,13 +3,8 @@ apply plugin: 'maven'
dependencies {
api project(':vtm-gdx')
file('natives').eachDir() { dir ->
api files(dir.path)
}
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
implementation 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
api 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19'
}
sourceSets {

9
vtm-extras/build.gradle
View File

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

3
vtm-gdx/build.gradle
View File

@ -4,8 +4,7 @@ apply plugin: 'maven'
dependencies {
api project(':vtm')
api project(':vtm-themes')
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion"
api "com.badlogicgames.gdx:gdx:$gdxVersion"
}
sourceSets {

3
vtm-http/build.gradle
View File

@ -3,8 +3,7 @@ apply plugin: 'maven'
dependencies {
api project(':vtm')
implementation 'com.squareup.okhttp3:okhttp:3.8.0'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
api 'com.squareup.okhttp3:okhttp:3.8.0'
}
sourceSets {

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

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

9
vtm-ios/build.gradle
View File

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

4
vtm-jeo/build.gradle
View File

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

2
vtm-json/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'maven'
dependencies {
api project(':vtm')
implementation 'com.fasterxml.jackson.core:jackson-core:2.8.4'
api 'com.fasterxml.jackson.core:jackson-core:2.8.4'
}
sourceSets {

3
vtm-jts/build.gradle
View File

@ -3,8 +3,7 @@ apply plugin: 'maven'
dependencies {
api project(':vtm')
implementation 'com.vividsolutions:jts:1.13'
implementation "org.slf4j:slf4j-api:$slf4jVersion"
api 'com.vividsolutions:jts:1.13'
}
sourceSets {

10
vtm-playground/build.gradle
View File

@ -2,16 +2,14 @@ apply plugin: 'application'
dependencies {
implementation project(':vtm-desktop')
implementation project(':vtm-extras')
file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
implementation files(dir.path)
}
implementation project(':vtm-http')
implementation project(':vtm-jeo')
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'
implementation 'org.jeo:jeo-render:0-SNAPSHOT'
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
implementation "org.slf4j:slf4j-jdk14:$slf4jVersion"
}

2
vtm-playground/src/simplelogger.properties
View File

@ -1,2 +0,0 @@
org.slf4j.simpleLogger.defaultLogLevel=debug
#org.slf4j.simpleLogger.showThreadName=true

1
vtm-tests/build.gradle
View File

@ -2,7 +2,6 @@ apply plugin: 'java'
dependencies {
implementation project(':vtm-http')
implementation 'com.squareup.okhttp3:okhttp:3.8.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.0'
testImplementation 'junit:junit:4.12'
testImplementation 'org.easytesting:fest-assert-core:2.0M10'

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

@ -6,9 +6,11 @@ repositories {
dependencies {
implementation project(':vtm-desktop')
file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
implementation files(dir.path)
}
implementation 'ch.qos.logback:logback-classic:1.2.3'
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
implementation 'com.fifesoft:rsyntaxtextarea:2.6.1'
implementation 'com.jtattoo:JTattoo:1.6.11'

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

@ -18,10 +18,6 @@ sourceSets {
dependencies {
providedCompile project(':vtm-web')
providedCompile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
providedCompile "org.slf4j:slf4j-api:$slf4jVersion"
providedCompile 'ru.finam:slf4j-gwt:1.7.7.1'
}

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

@ -18,11 +18,6 @@ sourceSets {
dependencies {
providedCompile project(':vtm-web')
providedCompile project(':vtm-extras')
providedCompile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
providedCompile "org.slf4j:slf4j-api:$slf4jVersion"
providedCompile 'org.timepedia.exporter:gwtexporter:2.5.1'
providedCompile 'ru.finam:slf4j-gwt:1.7.7.1'
}

9
vtm-web/build.gradle
View File

@ -17,12 +17,9 @@ sourceSets {
dependencies {
api project(':vtm-gdx')
api project(':vtm-extras')
implementation "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion"
implementation 'ru.finam:slf4j-gwt:1.7.7.1'
api "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
}
// explicit dependencies for org.gradle.configureondemand=true

2
vtm/build.gradle
View File

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