From 40b878f57bc1c565d8469efa49578913f517d694 Mon Sep 17 00:00:00 2001 From: Simon Macdonald-Smith Date: Fri, 11 Mar 2022 12:21:43 +0000 Subject: [PATCH 1/2] migrated to null safety --- .dart_tool/package_config.json | 62 +++++++ .dart_tool/package_config_subset | 37 ++++ .dart_tool/version | 1 + example/.dart_tool/package_config.json | 158 ++++++++++++++++++ example/.dart_tool/package_config_subset | 101 +++++++++++ example/.dart_tool/version | 1 + example/.flutter-plugins-dependencies | 1 + .../ios/Flutter/flutter_export_environment.sh | 13 ++ example/pubspec.yaml | 3 + lib/lamp.dart | 2 +- pubspec.yaml | 2 +- 11 files changed, 379 insertions(+), 2 deletions(-) create mode 100644 .dart_tool/package_config.json create mode 100644 .dart_tool/package_config_subset create mode 100644 .dart_tool/version create mode 100644 example/.dart_tool/package_config.json create mode 100644 example/.dart_tool/package_config_subset create mode 100644 example/.dart_tool/version create mode 100644 example/.flutter-plugins-dependencies create mode 100644 example/ios/Flutter/flutter_export_environment.sh diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json new file mode 100644 index 0000000..5f41585 --- /dev/null +++ b/.dart_tool/package_config.json @@ -0,0 +1,62 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "characters", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "collection", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "flutter", + "rootUri": "file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "material_color_utilities", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3", + "packageUri": "lib/", + "languageVersion": "2.13" + }, + { + "name": "meta", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.7.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "sky_engine", + "rootUri": "file:///C:/Users/smacdonaldsmith/source/repos/flutter/bin/cache/pkg/sky_engine", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "typed_data", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "vector_math", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.1", + "packageUri": "lib/", + "languageVersion": "2.14" + }, + { + "name": "lamp", + "rootUri": "../", + "packageUri": "lib/", + "languageVersion": "2.12" + } + ], + "generated": "2022-03-11T12:19:29.455595Z", + "generator": "pub", + "generatorVersion": "2.16.1" +} diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset new file mode 100644 index 0000000..944ea0b --- /dev/null +++ b/.dart_tool/package_config_subset @@ -0,0 +1,37 @@ +characters +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.2.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.2.0/lib/ +collection +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +material_color_utilities +2.13 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/lib/ +meta +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.7.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.7.0/lib/ +typed_data +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +vector_math +2.14 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.1/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib/ +sky_engine +2.12 +file:///C:/Users/smacdonaldsmith/source/repos/flutter/bin/cache/pkg/sky_engine/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter/bin/cache/pkg/sky_engine/lib/ +flutter +2.12 +file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter/lib/ +lamp +2.0 +file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/lib/ +2 diff --git a/.dart_tool/version b/.dart_tool/version new file mode 100644 index 0000000..fe18249 --- /dev/null +++ b/.dart_tool/version @@ -0,0 +1 @@ +2.10.3 \ No newline at end of file diff --git a/example/.dart_tool/package_config.json b/example/.dart_tool/package_config.json new file mode 100644 index 0000000..5ea76ab --- /dev/null +++ b/example/.dart_tool/package_config.json @@ -0,0 +1,158 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "async", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/async-2.8.2", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "boolean_selector", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "characters", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "charcode", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/charcode-1.3.1", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "clock", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/clock-1.1.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "collection", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "cupertino_icons", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "fake_async", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "flutter", + "rootUri": "file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "flutter_test", + "rootUri": "file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter_test", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "lamp", + "rootUri": "../../", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "matcher", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.11", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "material_color_utilities", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3", + "packageUri": "lib/", + "languageVersion": "2.13" + }, + { + "name": "meta", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.7.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "path", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/path-1.8.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "sky_engine", + "rootUri": "file:///C:/Users/smacdonaldsmith/source/repos/flutter/bin/cache/pkg/sky_engine", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "source_span", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/source_span-1.8.1", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "stack_trace", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "stream_channel", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "string_scanner", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "term_glyph", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "test_api", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/test_api-0.4.8", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "typed_data", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "vector_math", + "rootUri": "file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.1", + "packageUri": "lib/", + "languageVersion": "2.14" + }, + { + "name": "lamp_example", + "rootUri": "../", + "packageUri": "lib/", + "languageVersion": "2.0" + } + ], + "generated": "2022-03-11T12:19:30.878473Z", + "generator": "pub", + "generatorVersion": "2.16.1" +} diff --git a/example/.dart_tool/package_config_subset b/example/.dart_tool/package_config_subset new file mode 100644 index 0000000..d54820a --- /dev/null +++ b/example/.dart_tool/package_config_subset @@ -0,0 +1,101 @@ +async +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/async-2.8.2/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/async-2.8.2/lib/ +boolean_selector +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +characters +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.2.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/characters-1.2.0/lib/ +charcode +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/charcode-1.3.1/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/charcode-1.3.1/lib/ +clock +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/clock-1.1.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +collection +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +cupertino_icons +2.0 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ +fake_async +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/fake_async-1.2.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +matcher +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.11/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.11/lib/ +material_color_utilities +2.13 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/lib/ +meta +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.7.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/meta-1.7.0/lib/ +path +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/path-1.8.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +source_span +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/source_span-1.8.1/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/source_span-1.8.1/lib/ +stack_trace +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +stream_channel +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +string_scanner +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +term_glyph +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +test_api +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/test_api-0.4.8/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/test_api-0.4.8/lib/ +typed_data +2.12 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +vector_math +2.14 +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.1/ +file:///C:/Users/smacdonaldsmith/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib/ +sky_engine +2.12 +file:///C:/Users/smacdonaldsmith/source/repos/flutter/bin/cache/pkg/sky_engine/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter/bin/cache/pkg/sky_engine/lib/ +flutter +2.12 +file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter/lib/ +flutter_test +2.12 +file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter_test/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter_test/lib/ +lamp +2.0 +file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/lib/ +lamp_example +2.0 +file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/example/ +file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/example/lib/ +2 diff --git a/example/.dart_tool/version b/example/.dart_tool/version new file mode 100644 index 0000000..fe18249 --- /dev/null +++ b/example/.dart_tool/version @@ -0,0 +1 @@ +2.10.3 \ No newline at end of file diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies new file mode 100644 index 0000000..12e45aa --- /dev/null +++ b/example/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"lamp","path":"C:\\\\Users\\\\smacdonaldsmith\\\\source\\\\repos\\\\flutter_lamp\\\\","dependencies":[]}],"android":[{"name":"lamp","path":"C:\\\\Users\\\\smacdonaldsmith\\\\source\\\\repos\\\\flutter_lamp\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"lamp","dependencies":[]}],"date_created":"2022-03-11 12:19:30.934607","version":"2.10.3"} \ No newline at end of file diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh new file mode 100644 index 0000000..caf7f36 --- /dev/null +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=C:\Users\smacdonaldsmith\source\repos\flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\smacdonaldsmith\source\repos\flutter_lamp\example" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib\main.dart" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 36d78ad..c61f6bd 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,9 @@ name: lamp_example description: Demonstrates how to use the lamp plugin. +environment: + sdk: '>=2.0.0 <3.0.0' + dependencies: flutter: sdk: flutter diff --git a/lib/lamp.dart b/lib/lamp.dart index 20a09ae..401aad3 100644 --- a/lib/lamp.dart +++ b/lib/lamp.dart @@ -7,7 +7,7 @@ class Lamp { static const MethodChannel _channel = const MethodChannel('github.com/clovisnicolas/flutter_lamp'); static Future turnOn({double intensity = 1.0}) => _channel.invokeMethod('turnOn', {'intensity' : intensity.clamp(0.01, 1.0)}); static Future turnOff() => _channel.invokeMethod('turnOff'); - static Future get hasLamp async => await _channel.invokeMethod('hasLamp'); + static Future get hasLamp async => await _channel.invokeMethod('hasLamp'); static Future flash(Duration duration) => turnOn().whenComplete(() => new Future.delayed(duration, () => turnOff())); } diff --git a/pubspec.yaml b/pubspec.yaml index 2251be5..60ba3b1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ author: Clovis Nicolas homepage: https://github.com/clovisnicolas/flutter_lamp environment: - sdk: '>=2.0.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: From 2d88722f7c12f10afaa58b2a0ba08e3bd2ddbc6b Mon Sep 17 00:00:00 2001 From: Simon Macdonald-Smith Date: Fri, 11 Mar 2022 12:23:39 +0000 Subject: [PATCH 2/2] migrated example to null safety --- example/.dart_tool/package_config.json | 6 +++--- example/.dart_tool/package_config_subset | 2 +- example/.flutter-plugins-dependencies | 2 +- example/lib/main.dart | 4 ++-- example/pubspec.yaml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/example/.dart_tool/package_config.json b/example/.dart_tool/package_config.json index 5ea76ab..ef3a367 100644 --- a/example/.dart_tool/package_config.json +++ b/example/.dart_tool/package_config.json @@ -65,7 +65,7 @@ "name": "lamp", "rootUri": "../../", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.12" }, { "name": "matcher", @@ -149,10 +149,10 @@ "name": "lamp_example", "rootUri": "../", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.12" } ], - "generated": "2022-03-11T12:19:30.878473Z", + "generated": "2022-03-11T12:22:33.790429Z", "generator": "pub", "generatorVersion": "2.16.1" } diff --git a/example/.dart_tool/package_config_subset b/example/.dart_tool/package_config_subset index d54820a..1616bfe 100644 --- a/example/.dart_tool/package_config_subset +++ b/example/.dart_tool/package_config_subset @@ -91,7 +91,7 @@ flutter_test file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter_test/ file:///C:/Users/smacdonaldsmith/source/repos/flutter/packages/flutter_test/lib/ lamp -2.0 +2.12 file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/ file:///C:/Users/smacdonaldsmith/source/repos/flutter_lamp/lib/ lamp_example diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 12e45aa..f024375 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"lamp","path":"C:\\\\Users\\\\smacdonaldsmith\\\\source\\\\repos\\\\flutter_lamp\\\\","dependencies":[]}],"android":[{"name":"lamp","path":"C:\\\\Users\\\\smacdonaldsmith\\\\source\\\\repos\\\\flutter_lamp\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"lamp","dependencies":[]}],"date_created":"2022-03-11 12:19:30.934607","version":"2.10.3"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"lamp","path":"C:\\\\Users\\\\smacdonaldsmith\\\\source\\\\repos\\\\flutter_lamp\\\\","dependencies":[]}],"android":[{"name":"lamp","path":"C:\\\\Users\\\\smacdonaldsmith\\\\source\\\\repos\\\\flutter_lamp\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"lamp","dependencies":[]}],"date_created":"2022-03-11 12:22:33.862895","version":"2.10.3"} \ No newline at end of file diff --git a/example/lib/main.dart b/example/lib/main.dart index 6c4cdbc..c8131bc 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -10,7 +10,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - bool _hasFlash = false; + bool? _hasFlash = false; bool _isOn = false; double _intensity = 1.0; @@ -21,7 +21,7 @@ class _MyAppState extends State { } initPlatformState() async { - bool hasFlash = await Lamp.hasLamp; + bool? hasFlash = await Lamp.hasLamp; print("Device has flash ? $hasFlash"); setState(() { _hasFlash = hasFlash; }); } diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c61f6bd..c7ec4c2 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -2,7 +2,7 @@ name: lamp_example description: Demonstrates how to use the lamp plugin. environment: - sdk: '>=2.0.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: