Skip to content

Commit 3a09f4d

Browse files
committed
Merge branch 'develop' of https://github.com/ngageoint/geopackage-android-map into develop
2 parents af7b640 + 8b5d8ce commit 3a09f4d

File tree

77 files changed

+143
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+143
-145
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ Adheres to [Semantic Versioning](http://semver.org/).
44

55
---
66

7+
## [6.1.3](https://github.com/ngageoint/geopackage-android-map/releases/tag/6.1.3) (12-17-2021)
8+
9+
* geopackage-android version 6.1.3
10+
* play-services-maps version 18.0.1
11+
* gradle plugin updated to 7.0.4
12+
713
## [6.1.2](https://github.com/ngageoint/geopackage-android-map/releases/tag/6.1.2) (11-22-2021)
814

915
* geopackage-android version 6.1.2

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ geoPackage.close();
179179

180180
### Installation ###
181181

182-
Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage.map|geopackage-android-map|6.1.2|aar) (AAR, POM, Source, Javadoc)
182+
Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage.map|geopackage-android-map|6.1.3|aar) (AAR, POM, Source, Javadoc)
183183

184-
api 'mil.nga.geopackage.map:geopackage-android-map:6.1.2'
184+
api 'mil.nga.geopackage.map:geopackage-android-map:6.1.3'
185185

186186
### Build ###
187187

@@ -204,7 +204,7 @@ Include as repositories in your project build.gradle:
204204

205205
Include the dependency in your module build.gradle with desired version number:
206206

207-
api 'mil.nga.geopackage.map:geopackage-android-map:6.1.2'
207+
api 'mil.nga.geopackage.map:geopackage-android-map:6.1.3'
208208

209209
As part of the build process, run the "publishToMavenLocal" task on the geopackage-map Gradle script to update the Maven local repository.
210210

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenLocal()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.0.3'
9+
classpath 'com.android.tools.build:gradle:7.0.4'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1111
}
1212
}

docs/docs/api/allclasses-index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>All Classes (geopackage-android-map 6.1.1 API)</title>
6+
<title>All Classes (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
2020
<script type="text/javascript"><!--
2121
try {
2222
if (location.href.indexOf('is-external=true') == -1) {
23-
parent.document.title="All Classes (geopackage-android-map 6.1.1 API)";
23+
parent.document.title="All Classes (geopackage-android-map 6.1.3 API)";
2424
}
2525
}
2626
catch(err) {

docs/docs/api/allclasses.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>All Classes (geopackage-android-map 6.1.1 API)</title>
6+
<title>All Classes (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">

docs/docs/api/allpackages-index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>All Packages (geopackage-android-map 6.1.1 API)</title>
6+
<title>All Packages (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
2020
<script type="text/javascript"><!--
2121
try {
2222
if (location.href.indexOf('is-external=true') == -1) {
23-
parent.document.title="All Packages (geopackage-android-map 6.1.1 API)";
23+
parent.document.title="All Packages (geopackage-android-map 6.1.3 API)";
2424
}
2525
}
2626
catch(err) {

docs/docs/api/constant-values.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>Constant Field Values (geopackage-android-map 6.1.1 API)</title>
6+
<title>Constant Field Values (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
2020
<script type="text/javascript"><!--
2121
try {
2222
if (location.href.indexOf('is-external=true') == -1) {
23-
parent.document.title="Constant Field Values (geopackage-android-map 6.1.1 API)";
23+
parent.document.title="Constant Field Values (geopackage-android-map 6.1.3 API)";
2424
}
2525
}
2626
catch(err) {

docs/docs/api/deprecated-list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>Deprecated List (geopackage-android-map 6.1.1 API)</title>
6+
<title>Deprecated List (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
2020
<script type="text/javascript"><!--
2121
try {
2222
if (location.href.indexOf('is-external=true') == -1) {
23-
parent.document.title="Deprecated List (geopackage-android-map 6.1.1 API)";
23+
parent.document.title="Deprecated List (geopackage-android-map 6.1.3 API)";
2424
}
2525
}
2626
catch(err) {

docs/docs/api/help-doc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>API Help (geopackage-android-map 6.1.1 API)</title>
6+
<title>API Help (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
2020
<script type="text/javascript"><!--
2121
try {
2222
if (location.href.indexOf('is-external=true') == -1) {
23-
parent.document.title="API Help (geopackage-android-map 6.1.1 API)";
23+
parent.document.title="API Help (geopackage-android-map 6.1.3 API)";
2424
}
2525
}
2626
catch(err) {

docs/docs/api/index-all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>Index (geopackage-android-map 6.1.1 API)</title>
6+
<title>Index (geopackage-android-map 6.1.3 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
2020
<script type="text/javascript"><!--
2121
try {
2222
if (location.href.indexOf('is-external=true') == -1) {
23-
parent.document.title="Index (geopackage-android-map 6.1.1 API)";
23+
parent.document.title="Index (geopackage-android-map 6.1.3 API)";
2424
}
2525
}
2626
catch(err) {

0 commit comments

Comments
 (0)