From d309d36fb93b8831726ae8497ec6c545dcb4a8d5 Mon Sep 17 00:00:00 2001 From: Dustin Noyes Date: Wed, 11 Oct 2023 11:01:30 -0700 Subject: [PATCH] chore(flutter): remove null safety references --- .../FeatureFlags/feature-flags.json | 2 +- .../flutter/getting-started/50_codegenCli.mdx | 6 --- .../flutter/getting-started/40_codegen.mdx | 6 --- .../flutter/null-safety/null-safety.mdx | 38 ------------------- .../prereq/flutter_null_safety.mdx | 6 --- .../prereq/flutter_null_safety.mdx | 6 --- .../null-safety/q/platform/[platform].mdx | 5 --- 7 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 src/fragments/lib-v1/project-setup/flutter/null-safety/null-safety.mdx delete mode 100644 src/fragments/lib-v1/project-setup/native_common/prereq/flutter_null_safety.mdx delete mode 100644 src/fragments/lib/project-setup/native_common/prereq/flutter_null_safety.mdx delete mode 100644 src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx diff --git a/src/components/FeatureFlags/feature-flags.json b/src/components/FeatureFlags/feature-flags.json index f45b6ba10e0..a2e95d99bf9 100644 --- a/src/components/FeatureFlags/feature-flags.json +++ b/src/components/FeatureFlags/feature-flags.json @@ -639,7 +639,7 @@ ] }, "enableDartNullSafety": { - "description": "Generate Dart models with null safety for Flutter applications using DataStore. Refer to https://docs.amplify.aws/lib/project-setup/null-safety/q/platform/flutter for more information", + "description": "Generate Dart models with null safety for Flutter applications using DataStore.", "type": "Feature", "valueType": "Boolean", "versionAdded": "5.1.0", diff --git a/src/fragments/lib-v1/datastore/flutter/getting-started/50_codegenCli.mdx b/src/fragments/lib-v1/datastore/flutter/getting-started/50_codegenCli.mdx index 178878738c4..5a59463031a 100644 --- a/src/fragments/lib-v1/datastore/flutter/getting-started/50_codegenCli.mdx +++ b/src/fragments/lib-v1/datastore/flutter/getting-started/50_codegenCli.mdx @@ -7,9 +7,3 @@ amplify codegen models ``` The generated files will be under the `lib/models` directory by default. They get re-generated each time codegen is run. - - - -Codegen generates models using Dart null safety by default for a new Flutter project. It also provides a configurable feature flag to generate null safe models for existing Flutter projects. Check [here](https://docs.amplify.aws/lib-v1/project-setup/null-safety/q/platform/flutter) for more details. - - diff --git a/src/fragments/lib-v1/graphqlapi/flutter/getting-started/40_codegen.mdx b/src/fragments/lib-v1/graphqlapi/flutter/getting-started/40_codegen.mdx index 22c757c43d8..2d5175e9b82 100644 --- a/src/fragments/lib-v1/graphqlapi/flutter/getting-started/40_codegen.mdx +++ b/src/fragments/lib-v1/graphqlapi/flutter/getting-started/40_codegen.mdx @@ -7,9 +7,3 @@ amplify codegen models ``` The generated files will be under the `lib/models` directory by default. They get re-generated each time codegen is run. - - - -Codegen generates models using Dart null safety by default for a new Flutter project. It also provides a configurable feature flag to generate null safe models for existing Flutter projects. - - diff --git a/src/fragments/lib-v1/project-setup/flutter/null-safety/null-safety.mdx b/src/fragments/lib-v1/project-setup/flutter/null-safety/null-safety.mdx deleted file mode 100644 index 9eb003b360e..00000000000 --- a/src/fragments/lib-v1/project-setup/flutter/null-safety/null-safety.mdx +++ /dev/null @@ -1,38 +0,0 @@ -**Amplify Flutter and Null Safety** - - - -Amplify Flutter is planning to drop the support of non-null safe models in the near future. Please [migrate to Dart null safety](https://dart.dev/null-safety/migration-guide). - - - -The Amplify Flutter library supports [Dart null safety](https://dart.dev/null-safety) starting with version 0.2.0. - -| | amplify-flutter 0.1.x | amplify-flutter 0.2.x | -|------------------------------- |--------------------------------- |--------------------------------- | -| Null Safe App | Not Supported | Supported | -| Non Null Safe App w/ flutter v2 | Supported | Supported | -| Non Null Safe App w/ flutter v1 | Supported | Not Supported | - -**DataStore with Code Generated Models and Null Safety** - -The latest version of the Amplify CLI can generate Dart models with or without null safety using the `amplify codegen models` command. - -***Opting-in to Null Safety*** - -If you have a null safe app, or are migrating to null safety and your app uses generated models from amplify, you will need ensure the models are null safe as well. You should follow the [flutter null safety migration docs](https://dart.dev/null-safety/migration-guide) to migrate your application code, excluding the generated models. - -To migrate to null safe models, you can simply regenerate them following the instructions: -1. Make sure that the `pubspec.yaml` file at the root of your projects defines a Dart SDK version of 2.12.0 or greater. -2. Update your Amplify CLI to version 5.1.0 or higher. -```js -npm install -g @aws-amplify/cli -``` -4. Make sure that the `enableDartNullSafety` [feature flag](https://docs.amplify.aws/cli/reference/feature-flags) is set to "true" in your `amplify/cli.json` file. -5. Re-run `amplify codegen models` for your schema. - -***Opting-out of Null Safety*** - -If you wish to continue using non-null safe models: -1. Make sure that the `enableDartNullSafety` [feature flag](https://docs.amplify.aws/cli/reference/feature-flags) is set to "false". -2. Re-run `amplify codegen models` for your schema diff --git a/src/fragments/lib-v1/project-setup/native_common/prereq/flutter_null_safety.mdx b/src/fragments/lib-v1/project-setup/native_common/prereq/flutter_null_safety.mdx deleted file mode 100644 index 97eab702189..00000000000 --- a/src/fragments/lib-v1/project-setup/native_common/prereq/flutter_null_safety.mdx +++ /dev/null @@ -1,6 +0,0 @@ - - - -Amplify Flutter now supports Dart null safety. See the [null safety documentation](/lib-v1/project-setup/null-safety) for details. - - diff --git a/src/fragments/lib/project-setup/native_common/prereq/flutter_null_safety.mdx b/src/fragments/lib/project-setup/native_common/prereq/flutter_null_safety.mdx deleted file mode 100644 index 4acf8b59450..00000000000 --- a/src/fragments/lib/project-setup/native_common/prereq/flutter_null_safety.mdx +++ /dev/null @@ -1,6 +0,0 @@ - - - -Amplify Flutter now supports Dart null safety. See the [null safety documentation](/lib/project-setup/null-safety) for details. - - diff --git a/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx deleted file mode 100644 index f1909f2450b..00000000000 --- a/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx +++ /dev/null @@ -1,5 +0,0 @@ -export const meta = { - title: `Null safety`, - description: `Using Dart null safety with amplify-flutter`, -}; -