Skip to content

Commit

Permalink
update new signpost library dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
westnordost committed Aug 10, 2020
1 parent 2ac6ed0 commit 3691d47
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 35 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ 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

Depending on which part of the API you use, you can only include what you need:

<table>
<tr><th>Class</th><th>Dependency</th><th>Description</th></tr>
<tr><td>CapabilitiesDao</td><td><pre>de.westnordost:osmapi-core:1.0</pre></td><td>Getting server capabilities</td></tr>
<tr><td>PermissionsDao</td><td><pre>de.westnordost:osmapi-core:1.0</pre></td><td>Getting user permissions</td></tr>
<tr><td>MapDataDao</td><td><pre>de.westnordost:osmapi-map:1.1</pre></td><td>Getting map data, querying single elements and their relations toward each other and uploading changes in changesets</td></tr>
<tr><td>MapDataHistoryDao</td><td><pre>de.westnordost:osmapi-map:1.1</pre></td><td>Getting the history and specific versions of elements</td></tr>
<tr><td>NotesDao</td><td><pre>de.westnordost:osmapi-notes:1.0</pre></td><td>Getting finding, creating, commenting on and solving notes</td></tr>
<tr><td>GpsTracesDao</td><td><pre>de.westnordost:osmapi-traces:1.0</pre></td><td>Getting, uploading, updating and deleting GPS traces and trackpoints</td></tr>
<tr><td>ChangesetsDao</td><td><pre>de.westnordost:osmapi-changesets:1.1</pre></td><td>Finding changesets, changeset discussion, subscription and data</td></tr>
<tr><td>UserDao</td><td><pre>de.westnordost:osmapi-user:1.0</pre></td><td>Getting user information</td></tr>
<tr><td>UserPreferencesDao</td><td><pre>de.westnordost:osmapi-user:1.0</pre></td><td>Managing user preferences</td></tr>
<tr><td>CapabilitiesDao</td><td><pre>de.westnordost:osmapi-core:1.1</pre></td><td>Getting server capabilities</td></tr>
<tr><td>PermissionsDao</td><td><pre>de.westnordost:osmapi-core:1.1</pre></td><td>Getting user permissions</td></tr>
<tr><td>MapDataDao</td><td><pre>de.westnordost:osmapi-map:1.2</pre></td><td>Getting map data, querying single elements and their relations toward each other and uploading changes in changesets</td></tr>
<tr><td>MapDataHistoryDao</td><td><pre>de.westnordost:osmapi-map:1.2</pre></td><td>Getting the history and specific versions of elements</td></tr>
<tr><td>NotesDao</td><td><pre>de.westnordost:osmapi-notes:1.1</pre></td><td>Getting finding, creating, commenting on and solving notes</td></tr>
<tr><td>GpsTracesDao</td><td><pre>de.westnordost:osmapi-traces:1.1</pre></td><td>Getting, uploading, updating and deleting GPS traces and trackpoints</td></tr>
<tr><td>ChangesetsDao</td><td><pre>de.westnordost:osmapi-changesets:1.2</pre></td><td>Finding changesets, changeset discussion, subscription and data</td></tr>
<tr><td>UserDao</td><td><pre>de.westnordost:osmapi-user:1.1</pre></td><td>Getting user information</td></tr>
<tr><td>UserPreferencesDao</td><td><pre>de.westnordost:osmapi-user:1.1</pre></td><td>Managing user preferences</td></tr>
</table>

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
}
Expand Down
14 changes: 7 additions & 7 deletions libs/all/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
6 changes: 3 additions & 3 deletions libs/changesets/build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
4 changes: 2 additions & 2 deletions libs/core/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions libs/map/build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
4 changes: 2 additions & 2 deletions libs/notes/build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
4 changes: 2 additions & 2 deletions libs/traces/build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions libs/user/build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
2 changes: 1 addition & 1 deletion testutils/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
compile 'de.westnordost:osmapi-core:1.0'
compile 'de.westnordost:osmapi-core:1.1'
}

0 comments on commit 3691d47

Please sign in to comment.