diff --git a/geopackage-map/build.gradle b/geopackage-map/build.gradle index d3801aa..d5097b6 100644 --- a/geopackage-map/build.gradle +++ b/geopackage-map/build.gradle @@ -85,79 +85,83 @@ android { archives javadocJar, sourcesJar } - afterEvaluate { - - javadoc.classpath += files(android.libraryVariants.collect { variant -> - variant.getJavaCompileProvider().get().classpath.files - }) - - publishing { - publications { - maven(MavenPublication) { - from components.release - artifact javadocJar - artifact sourcesJar - - groupId = group - artifactId = archivesBaseName - version = version - pom { - name = 'GeoPackage Android Map' - packaging = 'aar' - description = 'GeoPackage Android Map implementation' - url = 'https://github.com/ngageoint/geopackage-android-map' - - scm { - url = 'git@github.com:ngageoint/geopackage-android-map.git' - connection = 'scm:git:git@github.com:ngageoint/geopackage-android-map.git' - developerConnection = 'scm:git:git@github.com:ngageoint/geopackage-android-map.git' - } + publishing { + singleVariant("release") + } - licenses { - license { - name = 'The MIT License (MIT)' - url = 'https://github.com/ngageoint/geopackage-android-map/blob/master/LICENSE.txt' - distribution = 'repo' - } - } +} - organization { - name = 'National Geospatial-Intelligence Agency' - url = 'https://www.nga.mil' +afterEvaluate { + + javadoc.classpath += files(android.libraryVariants.collect { variant -> + variant.getJavaCompileProvider().get().classpath.files + }) + + publishing { + publications { + maven(MavenPublication) { + from components.release + artifact javadocJar + artifact sourcesJar + + groupId = group + artifactId = archivesBaseName + version = version + pom { + name = 'GeoPackage Android Map' + packaging = 'aar' + description = 'GeoPackage Android Map implementation' + url = 'https://github.com/ngageoint/geopackage-android-map' + + scm { + url = 'git@github.com:ngageoint/geopackage-android-map.git' + connection = 'scm:git:git@github.com:ngageoint/geopackage-android-map.git' + developerConnection = 'scm:git:git@github.com:ngageoint/geopackage-android-map.git' + } + + licenses { + license { + name = 'The MIT License (MIT)' + url = 'https://github.com/ngageoint/geopackage-android-map/blob/master/LICENSE.txt' + distribution = 'repo' } + } - developers { - developer { - id = 'bosborn' - name = 'Brian Osborn' - email = 'bosborn@caci.com' - organizationUrl = 'https://www.caci.com/bit-systems' - timezone = 'UTC-07' - } + organization { + name = 'National Geospatial-Intelligence Agency' + url = 'https://www.nga.mil' + } + + developers { + developer { + id = 'bosborn' + name = 'Brian Osborn' + email = 'bosborn@caci.com' + organizationUrl = 'https://www.caci.com/bit-systems' + timezone = 'UTC-07' } } } } - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" - url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl - def user = project.hasProperty('ossrhUsername') ? ossrhUsername : "" - def pw = project.hasProperty('ossrhPassword') ? ossrhPassword : "" - credentials { - username = user - password = pw - } + } + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + def user = project.hasProperty('ossrhUsername') ? ossrhUsername : "" + def pw = project.hasProperty('ossrhPassword') ? ossrhPassword : "" + credentials { + username = user + password = pw } } } - - signing { - sign publishing.publications.maven - } } + signing { + sign publishing.publications.maven + } } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3133367..0b31998 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Nov 09 13:33:55 MST 2021 +#Tue Apr 19 07:39:01 MDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 418b7ca0aabfd0834cc61a26ec93c87b8616e145 Mon Sep 17 00:00:00 2001 From: Brian Osborn Date: Tue, 19 Apr 2022 08:05:21 -0600 Subject: [PATCH 11/11] Javadoc 6.3.0 --- docs/docs/api/allclasses-index.html | 4 +- docs/docs/api/allclasses.html | 2 +- docs/docs/api/allpackages-index.html | 4 +- docs/docs/api/constant-values.html | 4 +- docs/docs/api/deprecated-list.html | 4 +- docs/docs/api/help-doc.html | 4 +- docs/docs/api/index-all.html | 142 +++- docs/docs/api/index.html | 6 +- docs/docs/api/member-search-index.js | 2 +- docs/docs/api/member-search-index.zip | Bin 6116 -> 6468 bytes .../geopackage/map/GeoPackageMapActivity.html | 4 +- .../nga/geopackage/map/LatLngBoundingBox.html | 226 +++++- .../api/mil/nga/geopackage/map/MapUtils.html | 645 +++++++++++++++++- .../map/features/FeatureInfoBuilder.html | 363 +++++++++- .../geopackage/map/features/StyleCache.html | 4 +- .../geopackage/map/features/StyleUtils.html | 4 +- .../map/features/package-summary.html | 4 +- .../geopackage/map/features/package-tree.html | 4 +- .../nga/geopackage/map/geom/FeatureShape.html | 4 +- .../geopackage/map/geom/FeatureShapes.html | 4 +- .../geopackage/map/geom/GoogleMapShape.html | 4 +- .../map/geom/GoogleMapShapeConverter.html | 4 +- .../map/geom/GoogleMapShapeMarkers.html | 4 +- .../map/geom/GoogleMapShapeType.html | 4 +- .../nga/geopackage/map/geom/MultiLatLng.html | 4 +- .../nga/geopackage/map/geom/MultiMarker.html | 4 +- .../nga/geopackage/map/geom/MultiPolygon.html | 4 +- .../map/geom/MultiPolygonMarkers.html | 4 +- .../map/geom/MultiPolygonOptions.html | 4 +- .../geopackage/map/geom/MultiPolyline.html | 4 +- .../map/geom/MultiPolylineMarkers.html | 4 +- .../map/geom/MultiPolylineOptions.html | 4 +- .../map/geom/PolygonHoleMarkers.html | 4 +- .../geopackage/map/geom/PolygonMarkers.html | 4 +- .../map/geom/PolygonOrientation.html | 4 +- .../geopackage/map/geom/PolylineMarkers.html | 4 +- .../nga/geopackage/map/geom/ShapeMarkers.html | 4 +- .../map/geom/ShapeWithChildrenMarkers.html | 4 +- .../geopackage/map/geom/package-summary.html | 4 +- .../nga/geopackage/map/geom/package-tree.html | 4 +- .../nga/geopackage/map/package-summary.html | 4 +- .../mil/nga/geopackage/map/package-tree.html | 4 +- .../map/tiles/TileBoundingBoxMapUtils.html | 4 +- .../map/tiles/overlay/BoundedOverlay.html | 4 +- .../map/tiles/overlay/CompositeOverlay.html | 4 +- .../map/tiles/overlay/FeatureOverlay.html | 4 +- .../tiles/overlay/FeatureOverlayQuery.html | 157 +++-- .../map/tiles/overlay/GeoPackageOverlay.html | 4 +- .../overlay/GeoPackageOverlayFactory.html | 4 +- .../tiles/overlay/XYZGeoPackageOverlay.html | 4 +- .../map/tiles/overlay/package-summary.html | 4 +- .../map/tiles/overlay/package-tree.html | 4 +- .../geopackage/map/tiles/package-summary.html | 4 +- .../geopackage/map/tiles/package-tree.html | 4 +- docs/docs/api/overview-summary.html | 4 +- docs/docs/api/overview-tree.html | 4 +- docs/docs/api/package-search-index.zip | Bin 267 -> 267 bytes docs/docs/api/type-search-index.zip | Bin 524 -> 524 bytes 58 files changed, 1518 insertions(+), 213 deletions(-) diff --git a/docs/docs/api/allclasses-index.html b/docs/docs/api/allclasses-index.html index e73d1fb..f458a8c 100644 --- a/docs/docs/api/allclasses-index.html +++ b/docs/docs/api/allclasses-index.html @@ -3,7 +3,7 @@ -All Classes (geopackage-android-map 6.2.1 API) +All Classes (geopackage-android-map 6.3.0 API) @@ -20,7 +20,7 @@