From 3691d479212281fadfeb02af9b987deda3d92614 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 10 Aug 2020 19:10:14 +0200 Subject: [PATCH] update new signpost library dependency --- README.md | 24 +++++++++---------- libs/all/build.gradle | 14 +++++------ libs/changesets/build.gradle | 6 ++--- libs/core/build.gradle | 4 ++-- libs/map/build.gradle | 6 ++--- libs/notes/build.gradle | 4 ++-- libs/traces/build.gradle | 4 ++-- .../osmapi/traces/GpsTracesDaoTest.java | 3 ++- libs/user/build.gradle | 4 ++-- testutils/build.gradle | 2 +- 10 files changed, 36 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index fbbd3e5..3cab7ce 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Note, the OSM API, particularly the part to download the map data, is intended o ## Copyright and License -© 2016-2019 Tobias Zwick. This library is released under the terms of the [GNU Lesser General Public License](http://www.gnu.org/licenses/lgpl-3.0.html) (LGPL). +© 2016-2020 Tobias Zwick. This library is released under the terms of the [GNU Lesser General Public License](http://www.gnu.org/licenses/lgpl-3.0.html) (LGPL). ## Installation @@ -16,22 +16,22 @@ Depending on which part of the API you use, you can only include what you need: - - - - - - - - - + + + + + + + + +
ClassDependencyDescription
CapabilitiesDao
de.westnordost:osmapi-core:1.0
Getting server capabilities
PermissionsDao
de.westnordost:osmapi-core:1.0
Getting user permissions
MapDataDao
de.westnordost:osmapi-map:1.1
Getting map data, querying single elements and their relations toward each other and uploading changes in changesets
MapDataHistoryDao
de.westnordost:osmapi-map:1.1
Getting the history and specific versions of elements
NotesDao
de.westnordost:osmapi-notes:1.0
Getting finding, creating, commenting on and solving notes
GpsTracesDao
de.westnordost:osmapi-traces:1.0
Getting, uploading, updating and deleting GPS traces and trackpoints
ChangesetsDao
de.westnordost:osmapi-changesets:1.1
Finding changesets, changeset discussion, subscription and data
UserDao
de.westnordost:osmapi-user:1.0
Getting user information
UserPreferencesDao
de.westnordost:osmapi-user:1.0
Managing user preferences
CapabilitiesDao
de.westnordost:osmapi-core:1.1
Getting server capabilities
PermissionsDao
de.westnordost:osmapi-core:1.1
Getting user permissions
MapDataDao
de.westnordost:osmapi-map:1.2
Getting map data, querying single elements and their relations toward each other and uploading changes in changesets
MapDataHistoryDao
de.westnordost:osmapi-map:1.2
Getting the history and specific versions of elements
NotesDao
de.westnordost:osmapi-notes:1.1
Getting finding, creating, commenting on and solving notes
GpsTracesDao
de.westnordost:osmapi-traces:1.1
Getting, uploading, updating and deleting GPS traces and trackpoints
ChangesetsDao
de.westnordost:osmapi-changesets:1.2
Finding changesets, changeset discussion, subscription and data
UserDao
de.westnordost:osmapi-user:1.1
Getting user information
UserPreferencesDao
de.westnordost:osmapi-user:1.1
Managing user preferences
-To include everything, add [`de.westnordost:osmapi:3.5`](https://maven-repository.com/artifact/de.westnordost/osmapi/3.5) as a Maven dependency or download the jar from there. +To include everything, add [`de.westnordost:osmapi:3.7`](https://maven-repository.com/artifact/de.westnordost/osmapi/3.7) as a Maven dependency or download the jar from there. On Android, you need to exclude kxml2 from the dependencies since it is already built-in, like so: ```gradle - compile ('de.westnordost:osmapi:3.6') + compile ('de.westnordost:osmapi:3.7') { exclude group: 'net.sf.kxml', module: 'kxml2' // already included in Android } diff --git a/libs/all/build.gradle b/libs/all/build.gradle index 577f1d6..56d0d1e 100644 --- a/libs/all/build.gradle +++ b/libs/all/build.gradle @@ -1,12 +1,12 @@ archivesBaseName = "osmapi" -version = 3.6 +version = 3.7 description = 'Client for the OSM API 0.6' dependencies { - compile 'de.westnordost:osmapi-core:1.0' - compile 'de.westnordost:osmapi-changesets:1.1' - compile 'de.westnordost:osmapi-map:1.1' - compile 'de.westnordost:osmapi-notes:1.0' - compile 'de.westnordost:osmapi-traces:1.0' - compile 'de.westnordost:osmapi-user:1.0' + compile 'de.westnordost:osmapi-core:1.1' + compile 'de.westnordost:osmapi-changesets:1.2' + compile 'de.westnordost:osmapi-map:1.2' + compile 'de.westnordost:osmapi-notes:1.1' + compile 'de.westnordost:osmapi-traces:1.1' + compile 'de.westnordost:osmapi-user:1.1' } diff --git a/libs/changesets/build.gradle b/libs/changesets/build.gradle index aedee24..2510f34 100644 --- a/libs/changesets/build.gradle +++ b/libs/changesets/build.gradle @@ -1,10 +1,10 @@ archivesBaseName = "osmapi-changesets" -version = 1.1 +version = 1.2 description = 'Client for the OSM API 0.6 - Finding changesets, changeset discussion, subscription and data' dependencies { - compile 'de.westnordost:osmapi-core:1.0' - compile 'de.westnordost:osmapi-map:1.1' + compile 'de.westnordost:osmapi-core:1.1' + compile 'de.westnordost:osmapi-map:1.2' testCompile 'junit:junit:3.8.1' testCompile project(':testutils') } diff --git a/libs/core/build.gradle b/libs/core/build.gradle index 23231cc..16814f9 100644 --- a/libs/core/build.gradle +++ b/libs/core/build.gradle @@ -1,9 +1,9 @@ archivesBaseName = "osmapi-core" -version = 1.0 +version = 1.1 description = 'Client for the OSM API 0.6 - Core functionality, getting server capabilities, getting user permissions' dependencies { - compile 'oauth.signpost:signpost-core:1.2.1.2' + compile 'oauth.signpost:signpost-core:2.1.1' compile 'xmlpull:xmlpull:1.1.3.1' runtime 'net.sf.kxml:kxml2:2.3.0' testCompile 'junit:junit:3.8.1' diff --git a/libs/map/build.gradle b/libs/map/build.gradle index d7ce44d..15f17cb 100644 --- a/libs/map/build.gradle +++ b/libs/map/build.gradle @@ -1,10 +1,10 @@ archivesBaseName = "osmapi-map" -version = 1.1 +version = 1.2 description = 'Client for the OSM API 0.6 - Getting map data, querying single elements and their relations toward each other and uploading changes in changesets, getting the history and specific versions of elements' dependencies { - compile 'de.westnordost:osmapi-core:1.0' + compile 'de.westnordost:osmapi-core:1.1' testCompile 'junit:junit:3.8.1' - testCompile 'de.westnordost:osmapi-changesets:1.0' + testCompile 'de.westnordost:osmapi-changesets:1.1' testCompile project(':testutils') } diff --git a/libs/notes/build.gradle b/libs/notes/build.gradle index 21cbfff..6cb3b18 100644 --- a/libs/notes/build.gradle +++ b/libs/notes/build.gradle @@ -1,9 +1,9 @@ archivesBaseName = "osmapi-notes" -version = 1.0 +version = 1.1 description = 'Client for the OSM API 0.6 - Getting finding, creating, commenting on and solving notes' dependencies { - compile 'de.westnordost:osmapi-core:1.0' + compile 'de.westnordost:osmapi-core:1.1' testCompile 'junit:junit:3.8.1' testCompile project(':testutils') } diff --git a/libs/traces/build.gradle b/libs/traces/build.gradle index 9f52b07..131fd2b 100644 --- a/libs/traces/build.gradle +++ b/libs/traces/build.gradle @@ -1,9 +1,9 @@ archivesBaseName = "osmapi-traces" -version = 1.0 +version = 1.1 description = 'Client for the OSM API 0.6 - Getting, uploading, updating and deleting GPS traces and trackpoints' dependencies { - compile 'de.westnordost:osmapi-core:1.0' + compile 'de.westnordost:osmapi-core:1.1' testCompile 'junit:junit:3.8.1' testCompile project(':testutils') } diff --git a/libs/traces/src/test/java/de/westnordost/osmapi/traces/GpsTracesDaoTest.java b/libs/traces/src/test/java/de/westnordost/osmapi/traces/GpsTracesDaoTest.java index c64cc45..71575a9 100644 --- a/libs/traces/src/test/java/de/westnordost/osmapi/traces/GpsTracesDaoTest.java +++ b/libs/traces/src/test/java/de/westnordost/osmapi/traces/GpsTracesDaoTest.java @@ -192,7 +192,8 @@ public void testCreateGetUpdateDelete() assertEquals("test_case", trace.name); assertEquals(Visibility.PRIVATE, trace.visibility); assertEquals("test case desc", trace.description); - assertEquals(Arrays.asList("a tag","another"), trace.tags); + assertTrue(trace.tags.contains("a tag")); + assertTrue(trace.tags.contains("another")); assertEquals("osmagent-test-allow-everything", trace.userName); assertTrue(Math.abs(new Date().getTime() - trace.date.getTime()) < TEN_MINUTES); diff --git a/libs/user/build.gradle b/libs/user/build.gradle index 2f38c58..3e2279c 100644 --- a/libs/user/build.gradle +++ b/libs/user/build.gradle @@ -1,9 +1,9 @@ archivesBaseName = "osmapi-user" -version = 1.0 +version = 1.1 description = 'Client for the OSM API 0.6 - Managing user preferences, getting user information' dependencies { - compile 'de.westnordost:osmapi-core:1.0' + compile 'de.westnordost:osmapi-core:1.1' testCompile 'junit:junit:3.8.1' testCompile project(':testutils') } diff --git a/testutils/build.gradle b/testutils/build.gradle index 701033f..8b9b8f6 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile 'de.westnordost:osmapi-core:1.0' + compile 'de.westnordost:osmapi-core:1.1' }