Merge pull request #22 from festelo/dev

h3_flutter 0.6.3, geojson2h3, h3_common, h3_dart,  h3_ffi, h3_web 0.6.1 - update changelogs

.github/workflows/tests.yml

@@ -184,6 +184,11 @@ jobs:
         with:
           channel: beta
           architecture: x64
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
 
       - name: Disable macos
         run: flutter config --no-enable-macos-desktop
@@ -238,6 +243,7 @@ jobs:
 
   h3_flutter_test_desktop:
     runs-on: ${{ matrix.os }}
+    if: ${{ false }} # disable macos while https://github.com/github/roadmap/issues/620 is open
     strategy:
       matrix:
         os: [macos-latest]

geojson2h3/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.1
+* Update `h3_common` (v6.0.1) and `test` (v1.22.2) dependencies.
+
 ## 0.6.0
 * Split `h3_dart` library into 5 libraries - `h3_dart`, `h3_ffi`, `h3_web`, `h3_common`, `geojson2h3`
 * **[BREAKING]** Use `BigInt` instead of `int` for h3 indexes due to `web` specific.  

geojson2h3/pubspec.yaml

@@ -1,16 +1,16 @@
 name: geojson2h3
 description: The geojson2h3 library includes a set of utilities for conversion between GeoJSON polygons and H3 hexagon indexes, using h3. Inspired by JS library geojson2h3.
-version: 0.6.0
+version: 0.6.1
 homepage: https://github.com/festelo/h3_dart
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
-  h3_common: ^0.6.0
+  h3_common: ^0.6.1
 
 dev_dependencies:
-  test: ^1.21.2
+  test: ^1.22.2
   lints: ^2.0.0
   mockito: ^5.2.0
   build_runner: ^2.1.11

geojson2h3/test/geojson2h3_test.mocks.dart

@@ -86,10 +86,16 @@ class MockH3 extends _i1.Mock implements _i2.H3 {
       (super.noSuchMethod(Invocation.method(#hexRing, [h3Index, ringSize]),
           returnValue: <BigInt>[]) as List<BigInt>);
   @override
-  List<BigInt> polyfill({List<_i2.GeoCoord>? coordinates, int? resolution}) =>
+  List<BigInt> polyfill(
+          {List<_i2.GeoCoord>? coordinates,
+          int? resolution,
+          List<List<_i2.GeoCoord>>? holes}) =>
       (super.noSuchMethod(
-          Invocation.method(#polyfill, [],
-              {#coordinates: coordinates, #resolution: resolution}),
+          Invocation.method(#polyfill, [], {
+            #coordinates: coordinates,
+            #resolution: resolution,
+            #holes: holes
+          }),
           returnValue: <BigInt>[]) as List<BigInt>);
   @override
   List<BigInt> compact(List<BigInt>? hexagons) =>

h3_common/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.1
+* Update test dependency
+* Add `holes` param to `H3.polyfill` function (thanks [@iulian0512](https://github.com/iulian0512))
+* Fix lint warning
+
 ## 0.6.0
 * Split `h3_dart` library into 5 libraries - `h3_dart`, `h3_ffi`, `h3_web`, `h3_common`, `geojson2h3`
 * Use `BigInt` instead of `int` for h3 indexes due to `web` specific.

h3_common/lib/h3_common.dart

@@ -1,6 +1,5 @@
 export 'src/h3.dart';
 
-export 'src/models/geo_coord.dart';
 export 'src/models/coord_ij.dart';
 export 'src/models/h3_units.dart';
 export 'src/models/h3_exception.dart';

h3_common/lib/src/h3.dart

@@ -86,6 +86,7 @@ abstract class H3 {
   List<BigInt> polyfill({
     required List<GeoCoord> coordinates,
     required int resolution,
+    List<List<GeoCoord>> holes,
   });
 
   /// Compact a set of hexagons of the same resolution into a set of hexagons

h3_common/pubspec.yaml

@@ -1,12 +1,11 @@
 name: h3_common
 description: The package provides Dart version of the H3 Core library, a hexagon-based geographic grid system
-version: 0.6.0
+version: 0.6.1
 homepage: https://github.com/festelo/h3_dart
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
 
 dev_dependencies:
-
-  test: ^1.21.2
+  test: ^1.22.2
   lints: ^2.0.0

h3_dart/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.6.1
+* Add `holes` param to `H3.polyfill` function (thanks [@iulian0512](https://github.com/iulian0512))
+* Update dependencies
+* Fix web tests
+* Use `h3_web` 0.6.1
+* Use `h3_ffi` 0.6.1
+* Fix web setup readme.
+* Fix web example
+* Fix web test
+
 ## 0.6.0
 * Split `h3_dart` library into 5 libraries - `h3_dart`, `h3_ffi`, `h3_web`, `h3_common`, `geojson2h3`
 * Use `BigInt` instead of `int` for h3 indexes due to `web` specific.

h3_dart/README.md

@@ -52,7 +52,7 @@ Place your library somewhere and load it using `final h3 = const H3Factory().byP
 Web version is built on top of `h3-js`, you have to import it.  
 Add next line to your `index.html`:
 ```html
-    <script defer src="https://unpkg.com/h3-js"></script>
+    <script defer src="https://unpkg.com/h3-js@3.7.2"></script>
 ```  
 *Note, `main.dart.js` import should go after this line*  
 

h3_dart/example/ffi/pubspec.lock

@@ -5,22 +5,25 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   geojson2h3:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../../../geojson2h3"
-      relative: true
-    source: path
+      name: geojson2h3
+      sha256: "7e6352fcfc8a8e9bf2f6ee628845136f5cec91c64f5c666e63c291a79d29cfcc"
+      url: "https://pub.dev"
+    source: hosted
     version: "0.6.0"
   h3_common:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../../../h3_common"
-      relative: true
-    source: path
+      name: h3_common
+      sha256: "06e8e8543e0c1cdd4dbedcd12f751166704b0bf5d239c27ba2a2e7527a745f2a"
+      url: "https://pub.dev"
+    source: hosted
     version: "0.6.0"
   h3_dart:
     dependency: "direct main"
@@ -30,39 +33,52 @@ packages:
     source: path
     version: "0.6.0"
   h3_ffi:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../../../h3_ffi"
-      relative: true
-    source: path
+      name: h3_ffi
+      sha256: "92ae60a423a3ea6b248df00e70ba892b458dc094286aff2842ec68eeeaece053"
+      url: "https://pub.dev"
+    source: hosted
     version: "0.6.0"
   h3_web:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../../../h3_web"
-      relative: true
-    source: path
+      name: h3_web
+      sha256: f97291d19a5196641bca32bb4cb7d6378b1da076792a1969c094fb6389a24231
+      url: "https://pub.dev"
+    source: hosted
     version: "0.6.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      sha256: "323b7c70073cccf6b9b8d8b334be418a3293cfb612a560dc2737160a37bf61bd"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.6"
   lints:
     dependency: "direct dev"
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
+  dart: ">=2.19.0-345.0.dev <4.0.0"

h3_dart/example/ffi/pubspec.yaml

@@ -11,4 +11,4 @@ dependencies:
     path: ../..
 
 dev_dependencies:
-  lints: ^1.0.0
+  lints: ^2.0.1