5 Commits
0.9.1 ... 0.9.2

Author SHA1 Message Date
Emux
9de76897bc 0.9.2 2018-01-04 14:42:17 +02:00
Emux
a67b2f2c91 Gradle 4 / Android plugin 3 transitive dependencies, fix #433 2018-01-02 14:46:39 +02:00
Emux
791f054f70 libGDX 1.9.8, fix #464 2017-12-29 17:56:21 +02:00
Emux
7e13586463 Update changelog 2017-12-29 17:18:26 +02:00
Emux
c3639dcb24 Update Gretty 2017-12-29 17:18:10 +02:00
24 changed files with 48 additions and 81 deletions

View File

@@ -15,7 +15,7 @@ allprojects {
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
ext.androidBuildVersionTools = "27.0.3"
ext.gdxVersion = "1.9.7"
ext.gdxVersion = "1.9.8"
ext.gwtVersion = "2.8.0"
ext.slf4jVersion = "1.7.25"

View File

@@ -1,5 +1,11 @@
# Changelog
## Version 0.9.2 (2018-01-04)
- Gradle fix transitive dependencies [#433](https://github.com/mapsforge/vtm/issues/433)
- libGDX 1.9.8 [#464](https://github.com/mapsforge/vtm/issues/464)
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.9.2)
## Version 0.9.1 (2017-12-29)
- LwHttp engine fix http headers [#460](https://github.com/mapsforge/vtm/issues/460)

View File

@@ -41,8 +41,8 @@ implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
implementation 'com.badlogicgames.gdx:gdx:1.9.7'
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.7'
implementation 'com.badlogicgames.gdx:gdx:1.9.8'
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.8'
implementation 'com.caverock:androidsvg:1.2.2-beta-1'
```
@@ -57,9 +57,9 @@ implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-linux'
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx'
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
implementation 'com.badlogicgames.gdx:gdx:1.9.7'
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.7:natives-desktop'
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.7'
implementation 'com.badlogicgames.gdx:gdx:1.9.8'
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.8:natives-desktop'
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.8'
implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3'
implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux'
implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx'

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 {

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')

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 {

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"
}

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 {

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 {

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 {

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 {

View File

@@ -16,7 +16,7 @@ sourceSets.main.java.srcDirs = ["src/"]
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
ext {
roboVMVersion = "2.3.2"
roboVMVersion = "2.3.3"
}
launchIPhoneSimulator.dependsOn build
@@ -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"
}

View File

@@ -17,7 +17,7 @@ sourceSets.main.java.srcDirs = ["src/"]
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
ext {
roboVMVersion = "2.3.2"
roboVMVersion = "2.3.3"
}
launchIPhoneSimulator.dependsOn build
@@ -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) {

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'
}
}

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 {

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 {

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"
}

View File

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

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'

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'

View File

@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'org.akhikhl.gretty:gretty:1.4.2'
classpath 'org.akhikhl.gretty:gretty:2.0.0'
}
}
@@ -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'
}

View File

@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'org.akhikhl.gretty:gretty:1.4.2'
classpath 'org.akhikhl.gretty:gretty:2.0.0'
}
}
@@ -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'
}

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

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'
}