From 11e7f27b81fb4667808192cabbf5476bee7a2d62 Mon Sep 17 00:00:00 2001 From: Paolo Valerdi Date: Tue, 8 Jun 2021 14:46:13 -0500 Subject: [PATCH 1/2] Migrate to null safety --- example/pubspec.lock | 17 +++++-- lib/geopattern_flutter.dart | 3 +- lib/patterns/chevrons.dart | 10 ++-- lib/patterns/concentric_circles.dart | 12 ++--- lib/patterns/diamonds.dart | 12 ++--- lib/patterns/hexagons.dart | 10 ++-- lib/patterns/mosaic_squares.dart | 10 ++-- lib/patterns/nested_squares.dart | 10 ++-- lib/patterns/octagons.dart | 10 ++-- lib/patterns/overlapping_circles.dart | 12 ++--- lib/patterns/overlapping_rings.dart | 10 ++-- lib/patterns/plaid.dart | 12 ++--- lib/patterns/plus_signs.dart | 10 ++-- lib/patterns/sine_waves.dart | 10 ++-- lib/patterns/squares.dart | 10 ++-- lib/patterns/triangles.dart | 10 ++-- pubspec.lock | 67 +++++++++++++++------------ pubspec.yaml | 2 +- 18 files changed, 125 insertions(+), 112 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 26fc7d4..5b767b2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,13 +1,20 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.15.0" flutter: dependency: "direct main" description: flutter @@ -26,7 +33,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" sky_engine: dependency: transitive description: flutter @@ -38,13 +45,13 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0" sdks: - dart: ">=2.2.2 <3.0.0" + dart: ">=2.12.0-0 <3.0.0" diff --git a/lib/geopattern_flutter.dart b/lib/geopattern_flutter.dart index a72bf54..fad344d 100644 --- a/lib/geopattern_flutter.dart +++ b/lib/geopattern_flutter.dart @@ -9,8 +9,7 @@ class FullPainter extends CustomPainter { Color background; Pattern pattern; - FullPainter({@required this.pattern, @required this.background}) - : assert(pattern != null && background != null); + FullPainter({required this.pattern, required this.background}); @override void paint(Canvas canvas, Size size) { diff --git a/lib/patterns/chevrons.dart b/lib/patterns/chevrons.dart index fe5f186..45156f0 100644 --- a/lib/patterns/chevrons.dart +++ b/lib/patterns/chevrons.dart @@ -13,11 +13,11 @@ class Chevrons extends Pattern { final Color strokeColor; Chevrons( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny); Chevrons.fromHash(String hash) diff --git a/lib/patterns/concentric_circles.dart b/lib/patterns/concentric_circles.dart index 3d130d9..6f7239b 100644 --- a/lib/patterns/concentric_circles.dart +++ b/lib/patterns/concentric_circles.dart @@ -16,12 +16,12 @@ class ConcentricCircles extends Pattern { final List fillColors; ConcentricCircles( - {@required this.radius, - @required this.strokeWidth, - @required this.nx, - @required this.ny, - @required this.strokeColors, - @required this.fillColors}) + {required this.radius, + required this.strokeWidth, + required this.nx, + required this.ny, + required this.strokeColors, + required this.fillColors}) : assert(strokeColors.length == nx * ny), assert(fillColors.length == nx * ny); diff --git a/lib/patterns/diamonds.dart b/lib/patterns/diamonds.dart index ff438d9..aba4c55 100644 --- a/lib/patterns/diamonds.dart +++ b/lib/patterns/diamonds.dart @@ -16,12 +16,12 @@ class Diamonds extends Pattern { final Color strokeColor; Diamonds( - {@required this.w, - @required this.h, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.w, + required this.h, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny); Diamonds.fromHash(String hash) diff --git a/lib/patterns/hexagons.dart b/lib/patterns/hexagons.dart index f528eab..5b83f8b 100644 --- a/lib/patterns/hexagons.dart +++ b/lib/patterns/hexagons.dart @@ -18,11 +18,11 @@ class Hexagons extends Pattern { final double _hexHeight; Hexagons( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny), _hexWidth = side * 2, _hexHeight = side * sqrt(3); diff --git a/lib/patterns/mosaic_squares.dart b/lib/patterns/mosaic_squares.dart index b4e4f85..282a36c 100644 --- a/lib/patterns/mosaic_squares.dart +++ b/lib/patterns/mosaic_squares.dart @@ -13,11 +13,11 @@ class MosaicSquares extends Pattern { final Color strokeColor; MosaicSquares( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == 2 * nx * ny); MosaicSquares.fromHash(String hash) diff --git a/lib/patterns/nested_squares.dart b/lib/patterns/nested_squares.dart index 5f13b53..c32d772 100644 --- a/lib/patterns/nested_squares.dart +++ b/lib/patterns/nested_squares.dart @@ -15,11 +15,11 @@ class NestedSquares extends Pattern { final List strokeColors; NestedSquares( - {@required this.side, - @required this.outerside, - @required this.nx, - @required this.ny, - @required this.strokeColors}) + {required this.side, + required this.outerside, + required this.nx, + required this.ny, + required this.strokeColors}) : assert(strokeColors.length == nx * ny), assert(outerside > side); diff --git a/lib/patterns/octagons.dart b/lib/patterns/octagons.dart index 131968f..d90b21c 100644 --- a/lib/patterns/octagons.dart +++ b/lib/patterns/octagons.dart @@ -15,11 +15,11 @@ class Octagons extends Pattern { final Color strokeColor; Octagons( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny); Octagons.fromHash(String hash) diff --git a/lib/patterns/overlapping_circles.dart b/lib/patterns/overlapping_circles.dart index 5f69fff..da6ea8f 100644 --- a/lib/patterns/overlapping_circles.dart +++ b/lib/patterns/overlapping_circles.dart @@ -11,12 +11,12 @@ class OverlappingCircles extends Pattern { final int ny; final List fillColors; - OverlappingCircles( - {@required this.radius, - @required this.nx, - @required this.ny, - @required this.fillColors}) - : assert(fillColors.length == nx * ny); + OverlappingCircles({ + required this.radius, + required this.nx, + required this.ny, + required this.fillColors, + }) : assert(fillColors.length == nx * ny); OverlappingCircles.fromHash(String hash) : assert(hash.length == 40), diff --git a/lib/patterns/overlapping_rings.dart b/lib/patterns/overlapping_rings.dart index a0f31c6..9d0bf40 100644 --- a/lib/patterns/overlapping_rings.dart +++ b/lib/patterns/overlapping_rings.dart @@ -13,11 +13,11 @@ class OverlappingRings extends Pattern { final List strokeColors; OverlappingRings( - {@required this.radius, - @required this.strokeWidth, - @required this.nx, - @required this.ny, - @required this.strokeColors}) + {required this.radius, + required this.strokeWidth, + required this.nx, + required this.ny, + required this.strokeColors}) : assert(strokeColors.length == nx * ny); OverlappingRings.fromHash(String hash) diff --git a/lib/patterns/plaid.dart b/lib/patterns/plaid.dart index afa47c7..c68ffce 100644 --- a/lib/patterns/plaid.dart +++ b/lib/patterns/plaid.dart @@ -16,12 +16,12 @@ class Plaid extends Pattern { final int _ny; Plaid( - {@required this.horizontalOffsets, - @required this.verticalOffsets, - @required this.horizontalSizes, - @required this.verticalSizes, - @required this.horizontalFillColors, - @required this.verticalFillColors}) + {required this.horizontalOffsets, + required this.verticalOffsets, + required this.horizontalSizes, + required this.verticalSizes, + required this.horizontalFillColors, + required this.verticalFillColors}) : _nx = horizontalSizes.length, _ny = verticalSizes.length, assert(horizontalFillColors.length == horizontalSizes.length), diff --git a/lib/patterns/plus_signs.dart b/lib/patterns/plus_signs.dart index 13baf54..30f7dd9 100644 --- a/lib/patterns/plus_signs.dart +++ b/lib/patterns/plus_signs.dart @@ -15,11 +15,11 @@ class PlusSigns extends Pattern { final double _midh; PlusSigns( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny), _midl = side / 3, _midh = 2 * side / 3; diff --git a/lib/patterns/sine_waves.dart b/lib/patterns/sine_waves.dart index f3806dc..486c99f 100644 --- a/lib/patterns/sine_waves.dart +++ b/lib/patterns/sine_waves.dart @@ -18,11 +18,11 @@ class SineWaves extends Pattern { final double _xoff; SineWaves( - {@required this.period, - @required this.amplitude, - @required this.strokeOffsets, - @required this.strokeWidth, - @required this.strokeColors}) + {required this.period, + required this.amplitude, + required this.strokeOffsets, + required this.strokeWidth, + required this.strokeColors}) : _xoff = (period / 4) * .7, assert(strokeOffsets.length == strokeColors.length); diff --git a/lib/patterns/squares.dart b/lib/patterns/squares.dart index 3008a8a..5923ed5 100644 --- a/lib/patterns/squares.dart +++ b/lib/patterns/squares.dart @@ -15,11 +15,11 @@ class Squares extends Pattern { final Color strokeColor; Squares( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny); Squares.fromHash(String hash) diff --git a/lib/patterns/triangles.dart b/lib/patterns/triangles.dart index 343a68c..7499ec4 100644 --- a/lib/patterns/triangles.dart +++ b/lib/patterns/triangles.dart @@ -16,11 +16,11 @@ class Triangles extends Pattern { final double _trih; Triangles( - {@required this.side, - @required this.nx, - @required this.ny, - @required this.fillColors, - @required this.strokeColor}) + {required this.side, + required this.nx, + required this.ny, + required this.fillColors, + required this.strokeColor}) : assert(fillColors.length == nx * ny), _trih = sqrt(3) * side / 2; diff --git a/pubspec.lock b/pubspec.lock index 7642229..ad6d1df 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,28 +7,49 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.6.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.0" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.15.0" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -45,35 +66,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.2" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.7.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -85,55 +92,55 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.3.0" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0" sdks: - dart: ">=2.2.2 <3.0.0" + dart: ">=2.12.0 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index c93de83..37d8d92 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ author: Suyash homepage: https://github.com/suyash/geopattern environment: - sdk: ">=2.1.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: From 1065220bac59f864bc593fb9b54480b408abaf28 Mon Sep 17 00:00:00 2001 From: Paolo Valerdi Date: Tue, 8 Jun 2021 14:50:39 -0500 Subject: [PATCH 2/2] Update sample sdk version --- example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 5b767b2..90d43fe 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -54,4 +54,4 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0 <3.0.0" + dart: ">=2.12.0 <3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e00a538..2615cd2 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project. version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: