Bump to core 4.0.1 (#113)

* Bump to core 4.0.1

* update cell area assertion

* Remove explicit toolchain

* Fix Windows cross compile

* add PR number

Author: isaacbrodsky

CHANGELOG.md

@@ -7,6 +7,9 @@ file [H3Core.java](./src/main/java/com/uber/h3core/H3Core.java), and support
 for the Linux x64 and Darwin x64 platforms.
 
 ## Unreleased Changes
+## [4.0.2] - 2022-09-21
+### Changed
+- Upgraded the core library to v4.0.1. (#113)
 
 ## [4.0.1] - 2022-09-14
 ### Fixed

README.md

@@ -18,14 +18,14 @@ Add it to your pom.xml:
 <dependency>
     <groupId>com.uber</groupId>
     <artifactId>h3</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
 </dependency>
 ```
 
 Or, using Gradle:
 
 ```gradle
-compile("com.uber:h3:4.0.1")
+compile("com.uber:h3:4.0.2")
 ```
 
 Encode a location into a hexagon address:

h3version.properties

@@ -1 +1 @@
-h3.git.reference=v4.0.0
+h3.git.reference=v4.0.1

src/main/c/h3-java/CMakeLists.txt

@@ -23,9 +23,13 @@ include(CMakeDependentOption)
 
 # Needed due to CMP0042
 set(CMAKE_MACOSX_RPATH 1)
-set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchain.cmake"
-    CACHE FILEPATH
-    "Toolchain to use for building this project")
+if(NOT WIN32)
+    # Compiler options are set only on non-Windows, since these options
+    # are not correct for MSVC.
+    set(CMAKE_C_FLAGS_INIT "-Wall")
+    string(CONCAT CMAKE_C_FLAGS_DEBUG_INIT
+           "-g -gdwarf-2 -g3 -O0 -fno-inline -fno-eliminate-unused-debug-types")
+endif()
 set(LIBRARY_OUTPUT_PATH lib)
 set(H3_SOVERSION 1)
 

src/main/c/h3-java/build-h3-docker.sh

@@ -55,6 +55,7 @@ cmake -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_C_STANDARD=99 \
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=lib \
     ../../h3
 make h3
 H3_BUILD_ROOT="$(pwd)"

src/main/c/h3-java/cmake/toolchain.cmake

@@ -102,7 +102,7 @@ public void testGetPentagonIndexes() {
   public void testCellArea() {
     double areasKm2[] = {
       2.562182162955496e+06,
-      4.476842018179411e+05,
+      447684.20172018633,
       6.596162242711056e+04,
       9.228872919002590e+03,
       1.318694490797110e+03,

src/test/java/com/uber/h3core/TestMiscellaneous.java

@@ -104,7 +104,7 @@ public void testGetPentagonIndexes() {
   public void testCellArea() {
     double areasKm2[] = {
       2.562182162955496e+06,
-      4.476842018179411e+05,
+      447684.20172018633,
       6.596162242711056e+04,
       9.228872919002590e+03,
       1.318694490797110e+03,