From 1091fb1f334c1e318ba8abf7bd924d72800af760 Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Tue, 17 Nov 2020 17:16:04 +0100 Subject: [PATCH] Update to Dart 2.12 (#591) --- experimental/null_safety/README.md | 51 +------ .../.idea/codeStyles/Project.xml | 134 ------------------ .../null_safe_app/.idea/modules.xml | 9 -- .../.idea/runConfigurations/main_dart.xml | 7 - .../null_safe_app/.vscode/launch.json | 17 --- .../null_safe_app/analysis_options.yaml | 3 - .../null_safe_app/null_safe_app.iml | 18 --- .../null_safety/null_safe_app/pubspec.lock | 38 ++--- .../null_safety/null_safe_app/pubspec.yaml | 4 +- .../null_safety/null_unsafe_app/pubspec.lock | 38 ++--- 10 files changed, 43 insertions(+), 276 deletions(-) delete mode 100644 experimental/null_safety/null_safe_app/.idea/codeStyles/Project.xml delete mode 100644 experimental/null_safety/null_safe_app/.idea/modules.xml delete mode 100644 experimental/null_safety/null_safe_app/.idea/runConfigurations/main_dart.xml delete mode 100644 experimental/null_safety/null_safe_app/.vscode/launch.json delete mode 100644 experimental/null_safety/null_safe_app/analysis_options.yaml delete mode 100644 experimental/null_safety/null_safe_app/null_safe_app.iml diff --git a/experimental/null_safety/README.md b/experimental/null_safety/README.md index 378d0302c..d759f5682 100644 --- a/experimental/null_safety/README.md +++ b/experimental/null_safety/README.md @@ -27,53 +27,8 @@ The folder contains two sample Flutter apps: ## Running the example code -Null safety is still in technical preview. As a result you need to use a -dev-channel Flutter build, and you have to pass an [experiment -flag](https://dart.dev/tools/experiment-flags). - -### Flutter SDK requirements - This sample is [experimental](https://github.com/flutter/samples/tree/master/experimental), and -requires using a **dev channel** Flutter SDK. You can change to the dev channel -with `flutter channel dev` followed by `flutter upgrade` (don't forget to change -back to `flutter channel stable` for production use. - -### Running from the terminal/command-prompt - -Because null safety is still in tech preview, we need to pass a so-called -_experiment flag_ when invoking any Flutter command in the terminal, which looks -like this: `--enable-experiment=non-nullable`. - -To run the main app, type these commands in the terminal/command-prompt: - - - Windows: - - `cd \experimental\null_safety\null_safe_app\` - - `flutter pub get` - - `flutter run --enable-experiment=non-nullable` - - macOS/Linux: - - `cd /experimental/null_safety/null_safe_app/` - - `flutter pub get` - - `flutter run --enable-experiment=non-nullable` - -### Running from VSCode - -This example contains a launch configuration for VSCode that passes the -experimental flag, so to run the sample in VSCode: - - 1. Invoke **File > Open**, and select the `null_safety/null_safe_app` folder. - - 1. Select **Run > Run** and the project should run and print a message in the - Debug Console. - - -### Running from Android Studio - - 1. Start Android Studio. - - 1. Select Open Project, and select the `null_safety/null_safe_app` folder. - - 1. Open the file `lib/main.dart` in the code editor. - - 1. Select Run > Run and the project should run and print a message in the Run - pane. +requires using a **beta channel** Flutter SDK. You can change to the beta +channel with `flutter channel beta` followed by `flutter upgrade` (don't forget +to change back to `flutter channel stable` for production use. diff --git a/experimental/null_safety/null_safe_app/.idea/codeStyles/Project.xml b/experimental/null_safety/null_safe_app/.idea/codeStyles/Project.xml deleted file mode 100644 index 0d156937b..000000000 --- a/experimental/null_safety/null_safe_app/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/experimental/null_safety/null_safe_app/.idea/modules.xml b/experimental/null_safety/null_safe_app/.idea/modules.xml deleted file mode 100644 index cd5eb4c4b..000000000 --- a/experimental/null_safety/null_safe_app/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/experimental/null_safety/null_safe_app/.idea/runConfigurations/main_dart.xml b/experimental/null_safety/null_safe_app/.idea/runConfigurations/main_dart.xml deleted file mode 100644 index 567438fbd..000000000 --- a/experimental/null_safety/null_safe_app/.idea/runConfigurations/main_dart.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/experimental/null_safety/null_safe_app/.vscode/launch.json b/experimental/null_safety/null_safe_app/.vscode/launch.json deleted file mode 100644 index fed6d13b7..000000000 --- a/experimental/null_safety/null_safe_app/.vscode/launch.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "null_safe_app", - "program": "lib/main.dart", - "request": "launch", - "type": "dart", - "args": [ - "--enable-experiment=non-nullable", - ], - } - ] -} \ No newline at end of file diff --git a/experimental/null_safety/null_safe_app/analysis_options.yaml b/experimental/null_safety/null_safe_app/analysis_options.yaml deleted file mode 100644 index 416358209..000000000 --- a/experimental/null_safety/null_safe_app/analysis_options.yaml +++ /dev/null @@ -1,3 +0,0 @@ -analyzer: - enable-experiment: - - non-nullable diff --git a/experimental/null_safety/null_safe_app/null_safe_app.iml b/experimental/null_safety/null_safe_app/null_safe_app.iml deleted file mode 100644 index e5c837191..000000000 --- a/experimental/null_safety/null_safe_app/null_safe_app.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/experimental/null_safety/null_safe_app/pubspec.lock b/experimental/null_safety/null_safe_app/pubspec.lock index c82e95e84..f2cb8fcd7 100644 --- a/experimental/null_safety/null_safe_app/pubspec.lock +++ b/experimental/null_safety/null_safe_app/pubspec.lock @@ -7,42 +7,42 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.5.0-nullsafety.3" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0-nullsafety.3" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0-nullsafety.5" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0-nullsafety.3" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0-nullsafety.3" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0-nullsafety.5" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0-nullsafety.3" flutter: dependency: "direct main" description: flutter @@ -73,21 +73,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.10-nullsafety.3" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.4" + version: "1.3.0-nullsafety.6" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0-nullsafety.3" sky_engine: dependency: transitive description: flutter @@ -99,56 +99,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.0-nullsafety.4" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.4" + version: "1.10.0-nullsafety.6" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0-nullsafety.3" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0-nullsafety.3" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0-nullsafety.3" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.2.19-nullsafety.6" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0-nullsafety.5" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0-nullsafety.5" sdks: - dart: ">=2.11.0-234.0 <=2.11.0-242.0.dev" + dart: ">=2.12.0-29 <3.0.0" flutter: ">=1.24.0-3.0" diff --git a/experimental/null_safety/null_safe_app/pubspec.yaml b/experimental/null_safety/null_safe_app/pubspec.yaml index 4a0fd35d7..8ad2b304d 100644 --- a/experimental/null_safety/null_safe_app/pubspec.yaml +++ b/experimental/null_safety/null_safe_app/pubspec.yaml @@ -1,10 +1,10 @@ name: null_safe_app description: A new Flutter project. publish_to: 'none' # Do not publish apps & package using the null safety experiment. -version: 1.0.0+1 +version: 1.1.0 environment: - sdk: ">=2.11.0-234.0 <2.12.0" + sdk: ">=2.12.0-29 <3.0.0" flutter: ">=1.24.0-3.0" dependencies: diff --git a/experimental/null_safety/null_unsafe_app/pubspec.lock b/experimental/null_safety/null_unsafe_app/pubspec.lock index f96c66200..4202e05a0 100644 --- a/experimental/null_safety/null_unsafe_app/pubspec.lock +++ b/experimental/null_safety/null_unsafe_app/pubspec.lock @@ -7,42 +7,42 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.5.0-nullsafety.3" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0-nullsafety.3" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0-nullsafety.5" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0-nullsafety.3" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0-nullsafety.3" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0-nullsafety.5" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0-nullsafety.3" flutter: dependency: "direct main" description: flutter @@ -73,21 +73,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.10-nullsafety.3" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.4" + version: "1.3.0-nullsafety.6" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0-nullsafety.3" sky_engine: dependency: transitive description: flutter @@ -99,55 +99,55 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.0-nullsafety.4" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.4" + version: "1.10.0-nullsafety.6" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0-nullsafety.3" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0-nullsafety.3" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0-nullsafety.3" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.2.19-nullsafety.6" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0-nullsafety.5" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0-nullsafety.5" sdks: - dart: ">=2.10.0-110 <=2.11.0-234.0.dev" + dart: ">=2.12.0-0.0 <3.0.0"