Skip to content

Commit 2fbef06

Browse files
authored
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
1 parent 7ae4b3b commit 2fbef06

File tree

8 files changed

+16
-31
lines changed

8 files changed

+16
-31
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ file [H3Core.java](./src/main/java/com/uber/h3core/H3Core.java), and support
77
for the Linux x64 and Darwin x64 platforms.
88

99
## Unreleased Changes
10+
## [4.0.2] - 2022-09-21
11+
### Changed
12+
- Upgraded the core library to v4.0.1. (#113)
1013

1114
## [4.0.1] - 2022-09-14
1215
### Fixed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ Add it to your pom.xml:
1818
<dependency>
1919
<groupId>com.uber</groupId>
2020
<artifactId>h3</artifactId>
21-
<version>4.0.1</version>
21+
<version>4.0.2</version>
2222
</dependency>
2323
```
2424

2525
Or, using Gradle:
2626

2727
```gradle
28-
compile("com.uber:h3:4.0.1")
28+
compile("com.uber:h3:4.0.2")
2929
```
3030

3131
Encode a location into a hexagon address:

h3version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
h3.git.reference=v4.0.0
1+
h3.git.reference=v4.0.1

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ include(CMakeDependentOption)
2323

2424
# Needed due to CMP0042
2525
set(CMAKE_MACOSX_RPATH 1)
26-
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchain.cmake"
27-
CACHE FILEPATH
28-
"Toolchain to use for building this project")
26+
if(NOT WIN32)
27+
# Compiler options are set only on non-Windows, since these options
28+
# are not correct for MSVC.
29+
set(CMAKE_C_FLAGS_INIT "-Wall")
30+
string(CONCAT CMAKE_C_FLAGS_DEBUG_INIT
31+
"-g -gdwarf-2 -g3 -O0 -fno-inline -fno-eliminate-unused-debug-types")
32+
endif()
2933
set(LIBRARY_OUTPUT_PATH lib)
3034
set(H3_SOVERSION 1)
3135

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ cmake -DBUILD_SHARED_LIBS=OFF \
5555
-DCMAKE_C_STANDARD=99 \
5656
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
5757
-DCMAKE_BUILD_TYPE=Release \
58+
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=lib \
5859
../../h3
5960
make h3
6061
H3_BUILD_ROOT="$(pwd)"

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testGetPentagonIndexes() {
102102
public void testCellArea() {
103103
double areasKm2[] = {
104104
2.562182162955496e+06,
105-
4.476842018179411e+05,
105+
447684.20172018633,
106106
6.596162242711056e+04,
107107
9.228872919002590e+03,
108108
1.318694490797110e+03,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void testGetPentagonIndexes() {
104104
public void testCellArea() {
105105
double areasKm2[] = {
106106
2.562182162955496e+06,
107-
4.476842018179411e+05,
107+
447684.20172018633,
108108
6.596162242711056e+04,
109109
9.228872919002590e+03,
110110
1.318694490797110e+03,

0 commit comments

Comments
 (0)