6.4.0 release, core 6.4.0 with color library, sqlite bindings 3390000…

…, appcompat 1.4.2
ngageoint · Jul 11, 2022 · 8f8ee3e · 8f8ee3e
1 parent f97b99c
commit 8f8ee3e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,12 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 6.3.2 (TBD)
+## [6.4.0](https://github.com/ngageoint/geopackage-android/releases/tag/6.4.0) (07-11-2022)
 
-* TBD
+* compile and target SDK version 33
+* geopackage-core version 6.4.0
+* SQLite Android Bindings version 3390000
+* appcompat version 1.4.2
 
 ## [6.3.1](https://github.com/ngageoint/geopackage-android/releases/tag/6.3.1) (05-06-2022)
 

diff --git a/README.md b/README.md
@@ -176,9 +176,9 @@ geoPackage.close();
 
 ### Installation ###
 
-Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-android|6.3.1|aar) (AAR, POM, Source, Javadoc)
+Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-android|6.4.0|aar) (AAR, POM, Source, Javadoc)
 
-    api 'mil.nga.geopackage:geopackage-android:6.3.1'
+    api 'mil.nga.geopackage:geopackage-android:6.4.0'
 
 ### Build ###
 
@@ -201,7 +201,7 @@ Include as repositories in your project build.gradle:
 
 Include the dependency in your module build.gradle with desired version number:
 
-    api 'mil.nga.geopackage:geopackage-android:6.3.1'
+    api 'mil.nga.geopackage:geopackage-android:6.4.0'
 
 As part of the build process, run the "publishToMavenLocal" task on the geopackage-android Gradle script to update the Maven local repository.
 

diff --git a/docs/index.html b/docs/index.html
@@ -18,7 +18,7 @@ <h2 class="project-tagline">by the National Geospatial-Intelligence Agency</h2>
       <a href="http://ngageoint.github.io/geopackage-android/docs/api/" class="btn">API</a>
       <a href="https://github.com/ngageoint/geopackage-android/zipball/master" class="btn">.zip</a>
       <a href="https://github.com/ngageoint/geopackage-android/tarball/master" class="btn">.tar.gz</a>
-      <a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-android|6.3.1|aar" class="btn">The Central Repository</a>
+      <a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-android|6.4.0|aar" class="btn">The Central Repository</a>
     </section>
 
     <section class="main-content">

diff --git a/geopackage-sdk/build.gradle b/geopackage-sdk/build.gradle
@@ -4,14 +4,14 @@ apply plugin: 'signing'
 
 group = "mil.nga.geopackage"
 archivesBaseName = "geopackage-android"
-version = "6.3.2"
+version = "6.4.0"
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
 
         testApplicationId 'mil.nga.geopackage.test'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -56,6 +56,7 @@ android {
         options.links "https://ngageoint.github.io/simple-features-proj-java/docs/api/"
         options.links "https://ngageoint.github.io/simple-features-java/docs/api/"
         options.links "https://ngageoint.github.io/ogc-api-features-json-java/docs/api/"
+        options.links "https://ngageoint.github.io/color-java/docs/api/"
         options.links "https://ngageoint.github.io/tiff-java/docs/api/"
         options.links "https://ormlite.com/javadoc/ormlite-core/"
         options.links "https://ormlite.com/javadoc/ormlite-android/"
@@ -159,18 +160,18 @@ afterEvaluate {
 }
 
 dependencies {
-    api 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.appcompat:appcompat:1.4.2'
     api 'androidx.documentfile:documentfile:1.0.1'
     api 'com.j256.ormlite:ormlite-android:6.1'
-    api ('mil.nga.geopackage:geopackage-core:6.3.1'){
+    api ('mil.nga.geopackage:geopackage-core:6.4.0'){
         exclude module: 'ormlite-core'
         exclude group: 'com.j256.ormlite'
     }
     api 'ar.com.hjg:pngj:2.1.0'
     api 'mil.nga:tiff:3.0.0'
-    api 'mil.nga:sqlite-android:3380400'
+    api 'mil.nga:sqlite-android:3390000'
     javadocDeps 'com.j256.ormlite:ormlite-android:6.1',
-            'mil.nga.geopackage:geopackage-core:6.3.1',
+            'mil.nga.geopackage:geopackage-core:6.4.0',
             'ar.com.hjg:pngj:2.1.0',
             'mil.nga:tiff:3.0.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'

diff --git a/geopackage-sdk/src/androidTest/java/mil/nga/geopackage/GeoPackageExample.java b/geopackage-sdk/src/androidTest/java/mil/nga/geopackage/GeoPackageExample.java
@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import mil.nga.color.Color;
+import mil.nga.color.ColorConstants;
 import mil.nga.geopackage.attributes.AttributesColumn;
 import mil.nga.geopackage.attributes.AttributesCursor;
 import mil.nga.geopackage.attributes.AttributesDao;
@@ -108,8 +110,6 @@
 import mil.nga.geopackage.io.BitmapConverter;
 import mil.nga.geopackage.srs.SpatialReferenceSystem;
 import mil.nga.geopackage.srs.SpatialReferenceSystemDao;
-import mil.nga.geopackage.style.Color;
-import mil.nga.geopackage.style.ColorConstants;
 import mil.nga.geopackage.tiles.TileBoundingBoxUtils;
 import mil.nga.geopackage.tiles.TileGenerator;
 import mil.nga.geopackage.tiles.TileGrid;
@@ -2137,7 +2137,7 @@ private static void createFeatureStyleExtension(GeoPackage geoPackage)
         icon1.setName("Building");
         icon1.setDescription("Building Icon");
         icon1.setData(BitmapFactory.decodeFile(
-                TestUtils.getAssetFileInternalStorageLocation(geoPackage.getContext(), "building.png")),
+                        TestUtils.getAssetFileInternalStorageLocation(geoPackage.getContext(), "building.png")),
                 Bitmap.CompressFormat.PNG);
         icon1.setContentType("image/png");
         icon1.setWidth(32.0);
@@ -2150,7 +2150,7 @@ private static void createFeatureStyleExtension(GeoPackage geoPackage)
         icon2.setName("College");
         icon2.setDescription("College Icon");
         icon2.setData(BitmapFactory.decodeFile(
-                TestUtils.getAssetFileInternalStorageLocation(geoPackage.getContext(), "college.png")),
+                        TestUtils.getAssetFileInternalStorageLocation(geoPackage.getContext(), "college.png")),
                 Bitmap.CompressFormat.PNG);
         icon2.setContentType("image/png");
         icon2.setWidth(32.0);
@@ -2162,7 +2162,7 @@ private static void createFeatureStyleExtension(GeoPackage geoPackage)
         icon3.setName("Tractor");
         icon3.setDescription("Tractor Icon");
         icon3.setData(BitmapFactory.decodeFile(
-                TestUtils.getAssetFileInternalStorageLocation(geoPackage.getContext(), "tractor.png")),
+                        TestUtils.getAssetFileInternalStorageLocation(geoPackage.getContext(), "tractor.png")),
                 Bitmap.CompressFormat.PNG);
         icon3.setContentType("image/png");
         icon3.setAnchorV(1.0);

diff --git a/...e-sdk/src/androidTest/java/mil/nga/geopackage/extension/nga/style/FeatureStylesUtils.java b/...e-sdk/src/androidTest/java/mil/nga/geopackage/extension/nga/style/FeatureStylesUtils.java
@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import mil.nga.color.Color;
 import mil.nga.geopackage.GeoPackage;
 import mil.nga.geopackage.TestConstants;
 import mil.nga.geopackage.TestUtils;
@@ -24,7 +25,6 @@
 import mil.nga.geopackage.features.user.FeatureCursor;
 import mil.nga.geopackage.features.user.FeatureDao;
 import mil.nga.geopackage.features.user.FeatureRow;
-import mil.nga.geopackage.style.Color;
 import mil.nga.geopackage.user.custom.UserCustomCursor;
 import mil.nga.geopackage.user.custom.UserCustomRow;
 import mil.nga.sf.GeometryType;
@@ -373,12 +373,12 @@ public static void testFeatureStyles(GeoPackage geoPackage)
 
                 Map<Long, StyleRow> allStyles = featureTableStyles.getStyles();
                 Map<Long, StyleRow> allFeatureStyles = featureTableStyles.getFeatureStyles();
-                for(long styleId: allFeatureStyles.keySet()){
+                for (long styleId : allFeatureStyles.keySet()) {
                     TestCase.assertTrue(allStyles.containsKey(styleId));
                 }
                 Map<Long, IconRow> allIcons = featureTableStyles.getIcons();
                 Map<Long, IconRow> allFeatureIcons = featureTableStyles.getFeatureIcons();
-                for(long iconId: allFeatureIcons.keySet()){
+                for (long iconId : allFeatureIcons.keySet()) {
                     TestCase.assertTrue(allIcons.containsKey(iconId));
                 }
 

diff --git a/geopackage-sdk/src/main/java/mil/nga/geopackage/extension/nga/style/StyleRow.java b/geopackage-sdk/src/main/java/mil/nga/geopackage/extension/nga/style/StyleRow.java
@@ -2,10 +2,10 @@
 
 import java.util.regex.Pattern;
 
+import mil.nga.color.Color;
 import mil.nga.geopackage.GeoPackageException;
 import mil.nga.geopackage.attributes.AttributesColumn;
 import mil.nga.geopackage.attributes.AttributesRow;
-import mil.nga.geopackage.style.Color;
 
 /**
  * Style Row containing the values from a single cursor row

diff --git a/geopackage-sdk/src/main/java/mil/nga/geopackage/tiles/features/FeatureTiles.java b/geopackage-sdk/src/main/java/mil/nga/geopackage/tiles/features/FeatureTiles.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Set;
 
+import mil.nga.color.Color;
 import mil.nga.geopackage.BoundingBox;
 import mil.nga.geopackage.GeoPackage;
 import mil.nga.geopackage.GeoPackageException;
@@ -33,7 +34,6 @@
 import mil.nga.geopackage.features.user.FeatureDao;
 import mil.nga.geopackage.features.user.FeatureRow;
 import mil.nga.geopackage.io.BitmapConverter;
-import mil.nga.geopackage.style.Color;
 import mil.nga.geopackage.style.PixelBounds;
 import mil.nga.geopackage.tiles.TileBoundingBoxUtils;
 import mil.nga.geopackage.tiles.TileUtils;