wip

Author: isaacbrodsky

build.gradle

@@ -54,6 +54,10 @@ def h3VersionProps = new Properties()
 file("h3version.properties").withInputStream { h3VersionProps.load(it) }
 ext.h3GitReference = h3VersionProps.getProperty('h3.git.reference')
 
+compileJava {
+    options.compilerArgs += ['-h', "${projectDir}/src/main/c/h3-java/src"]
+}
+
 // Task to build H3 native code
 task buildH3(type: Exec) {
     workingDir "${projectDir}"
@@ -65,11 +69,7 @@ task buildH3(type: Exec) {
                 h3SystemPrune, h3DockcrossTag, h3DockcrossOnly,
                 h3GithubArtifactsUse, h3GithubArtifactsByRun
     }
-}
-
-compileJava {
-    dependsOn buildH3
-    options.compilerArgs += ['-h', "${projectDir}/src/main/c/h3-java/src"]
+    dependsOn compileJava
 }
 
 spotless {
@@ -89,6 +89,12 @@ jacocoTestReport {
     }
 }
 
+jar {
+    dependsOn buildH3
+    from sourceSets.main.resources
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {

src/main/c/h3-java/src/jniapi.c

@@ -666,7 +666,7 @@ JNIEXPORT void JNICALL Java_com_uber_h3core_NativeMethods_polygonToCells(
 
     jlong *resultsElements = (**env).GetLongArrayElements(env, results, 0);
 
-    H3Error err;
+    H3Error err = E_SUCCESS;
     if (resultsElements != NULL) {
         // if sz is too small, bad things will happen
         err = polygonToCells(&polygon, res, flags, resultsElements);
@@ -700,7 +700,7 @@ Java_com_uber_h3core_NativeMethods_polygonToCellsExperimental(
     jlong *resultsElements = (**env).GetLongArrayElements(env, results, 0);
     jsize resultsSize = (**env).GetArrayLength(env, results);
 
-    H3Error err;
+    H3Error err = E_SUCCESS;
     if (resultsElements != NULL) {
         err = polygonToCellsExperimental(&polygon, res, flags, resultsSize,
                                          resultsElements);