diff --git a/experimental/null_safety/README.md b/null_safety/README.md similarity index 71% rename from experimental/null_safety/README.md rename to null_safety/README.md index d759f5682..e6cbba400 100644 --- a/experimental/null_safety/README.md +++ b/null_safety/README.md @@ -1,7 +1,7 @@ # Null safety Flutter example -This folder contains a demonstration of the upcoming Dart feature, sound null -safety. For additional information about this feature, see +This folder contains a demonstration of Dart's sound null +safety feature. For additional information about this feature, see https://dart.dev/null-safety. The folder contains two sample Flutter apps: @@ -27,8 +27,4 @@ The folder contains two sample Flutter apps: ## Running the example code -This sample is -[experimental](https://github.com/flutter/samples/tree/master/experimental), and -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. +This sample requires Flutter 2.0 or later. diff --git a/experimental/null_safety/null_safe_app/.gitignore b/null_safety/null_safe_app/.gitignore similarity index 100% rename from experimental/null_safety/null_safe_app/.gitignore rename to null_safety/null_safe_app/.gitignore diff --git a/experimental/null_safety/null_safe_app/.metadata b/null_safety/null_safe_app/.metadata similarity index 100% rename from experimental/null_safety/null_safe_app/.metadata rename to null_safety/null_safe_app/.metadata diff --git a/experimental/null_safety/null_safe_app/README.md b/null_safety/null_safe_app/README.md similarity index 100% rename from experimental/null_safety/null_safe_app/README.md rename to null_safety/null_safe_app/README.md diff --git a/experimental/null_safety/null_safe_app/android/.gitignore b/null_safety/null_safe_app/android/.gitignore similarity index 100% rename from experimental/null_safety/null_safe_app/android/.gitignore rename to null_safety/null_safe_app/android/.gitignore diff --git a/experimental/null_safety/null_safe_app/android/app/build.gradle b/null_safety/null_safe_app/android/app/build.gradle similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/build.gradle rename to null_safety/null_safe_app/android/app/build.gradle diff --git a/experimental/null_safety/null_safe_app/android/app/src/debug/AndroidManifest.xml b/null_safety/null_safe_app/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/debug/AndroidManifest.xml rename to null_safety/null_safe_app/android/app/src/debug/AndroidManifest.xml diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml b/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml rename to null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/kotlin/com/example/null_safe_app/MainActivity.kt b/null_safety/null_safe_app/android/app/src/main/kotlin/com/example/null_safe_app/MainActivity.kt similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/kotlin/com/example/null_safe_app/MainActivity.kt rename to null_safety/null_safe_app/android/app/src/main/kotlin/com/example/null_safe_app/MainActivity.kt diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml b/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml rename to null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/null_safety/null_safe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to null_safety/null_safe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/null_safety/null_safe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to null_safety/null_safe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/null_safety/null_safe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to null_safety/null_safe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/null_safety/null_safe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to null_safety/null_safe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/null_safety/null_safe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to null_safety/null_safe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml b/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml rename to null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml diff --git a/experimental/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml b/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml rename to null_safety/null_safe_app/android/app/src/main/res/values/styles.xml diff --git a/experimental/null_safety/null_safe_app/android/app/src/profile/AndroidManifest.xml b/null_safety/null_safe_app/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from experimental/null_safety/null_safe_app/android/app/src/profile/AndroidManifest.xml rename to null_safety/null_safe_app/android/app/src/profile/AndroidManifest.xml diff --git a/experimental/null_safety/null_safe_app/android/build.gradle b/null_safety/null_safe_app/android/build.gradle similarity index 100% rename from experimental/null_safety/null_safe_app/android/build.gradle rename to null_safety/null_safe_app/android/build.gradle diff --git a/experimental/null_safety/null_safe_app/android/gradle.properties b/null_safety/null_safe_app/android/gradle.properties similarity index 100% rename from experimental/null_safety/null_safe_app/android/gradle.properties rename to null_safety/null_safe_app/android/gradle.properties diff --git a/experimental/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties b/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from experimental/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties rename to null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties diff --git a/experimental/null_safety/null_safe_app/android/null_safe_app_android.iml b/null_safety/null_safe_app/android/null_safe_app_android.iml similarity index 100% rename from experimental/null_safety/null_safe_app/android/null_safe_app_android.iml rename to null_safety/null_safe_app/android/null_safe_app_android.iml diff --git a/experimental/null_safety/null_safe_app/android/settings.gradle b/null_safety/null_safe_app/android/settings.gradle similarity index 100% rename from experimental/null_safety/null_safe_app/android/settings.gradle rename to null_safety/null_safe_app/android/settings.gradle diff --git a/experimental/null_safety/null_safe_app/ios/.gitignore b/null_safety/null_safe_app/ios/.gitignore similarity index 100% rename from experimental/null_safety/null_safe_app/ios/.gitignore rename to null_safety/null_safe_app/ios/.gitignore diff --git a/experimental/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist b/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist rename to null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist diff --git a/experimental/null_safety/null_safe_app/ios/Flutter/Debug.xcconfig b/null_safety/null_safe_app/ios/Flutter/Debug.xcconfig similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Flutter/Debug.xcconfig rename to null_safety/null_safe_app/ios/Flutter/Debug.xcconfig diff --git a/experimental/null_safety/null_safe_app/ios/Flutter/Release.xcconfig b/null_safety/null_safe_app/ios/Flutter/Release.xcconfig similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Flutter/Release.xcconfig rename to null_safety/null_safe_app/ios/Flutter/Release.xcconfig diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj b/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj rename to null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to null_safety/null_safe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/null_safety/null_safe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to null_safety/null_safe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcworkspace/contents.xcworkspacedata b/null_safety/null_safe_app/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcworkspace/contents.xcworkspacedata rename to null_safety/null_safe_app/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/experimental/null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to null_safety/null_safe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/experimental/null_safety/null_safe_app/ios/Runner/AppDelegate.swift b/null_safety/null_safe_app/ios/Runner/AppDelegate.swift similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/AppDelegate.swift rename to null_safety/null_safe_app/ios/Runner/AppDelegate.swift diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to null_safety/null_safe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/null_safety/null_safe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to null_safety/null_safe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Base.lproj/Main.storyboard b/null_safety/null_safe_app/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Base.lproj/Main.storyboard rename to null_safety/null_safe_app/ios/Runner/Base.lproj/Main.storyboard diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Info.plist b/null_safety/null_safe_app/ios/Runner/Info.plist similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Info.plist rename to null_safety/null_safe_app/ios/Runner/Info.plist diff --git a/experimental/null_safety/null_safe_app/ios/Runner/Runner-Bridging-Header.h b/null_safety/null_safe_app/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from experimental/null_safety/null_safe_app/ios/Runner/Runner-Bridging-Header.h rename to null_safety/null_safe_app/ios/Runner/Runner-Bridging-Header.h diff --git a/experimental/null_safety/null_safe_app/lib/badapp.dart b/null_safety/null_safe_app/lib/badapp.dart similarity index 100% rename from experimental/null_safety/null_safe_app/lib/badapp.dart rename to null_safety/null_safe_app/lib/badapp.dart diff --git a/experimental/null_safety/null_safe_app/lib/goodapp.dart b/null_safety/null_safe_app/lib/goodapp.dart similarity index 100% rename from experimental/null_safety/null_safe_app/lib/goodapp.dart rename to null_safety/null_safe_app/lib/goodapp.dart diff --git a/experimental/null_safety/null_safe_app/lib/main.dart b/null_safety/null_safe_app/lib/main.dart similarity index 100% rename from experimental/null_safety/null_safe_app/lib/main.dart rename to null_safety/null_safe_app/lib/main.dart diff --git a/experimental/null_safety/null_safe_app/lib/services.dart b/null_safety/null_safe_app/lib/services.dart similarity index 100% rename from experimental/null_safety/null_safe_app/lib/services.dart rename to null_safety/null_safe_app/lib/services.dart diff --git a/experimental/null_safety/null_safe_app/pubspec.lock b/null_safety/null_safe_app/pubspec.lock similarity index 81% rename from experimental/null_safety/null_safe_app/pubspec.lock rename to null_safety/null_safe_app/pubspec.lock index b1a993fd5..d3515f206 100644 --- a/experimental/null_safety/null_safe_app/pubspec.lock +++ b/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.3" + version: "2.5.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.5" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.3" + version: "1.2.0" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.5" + version: "1.15.0" 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.3" + version: "1.2.0" 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.3" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.6" + version: "1.3.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.3" + version: "1.8.0" 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.4" + version: "1.8.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.6" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.3" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.6" + version: "0.2.19" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.5" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.5" + version: "2.1.0" sdks: - dart: ">=2.12.0-29 <3.0.0" - flutter: ">=1.24.0-3.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=2.0.0" diff --git a/experimental/null_safety/null_safe_app/pubspec.yaml b/null_safety/null_safe_app/pubspec.yaml similarity index 75% rename from experimental/null_safety/null_safe_app/pubspec.yaml rename to null_safety/null_safe_app/pubspec.yaml index 8ad2b304d..51614b2d2 100644 --- a/experimental/null_safety/null_safe_app/pubspec.yaml +++ b/null_safety/null_safe_app/pubspec.yaml @@ -1,16 +1,16 @@ name: null_safe_app description: A new Flutter project. publish_to: 'none' # Do not publish apps & package using the null safety experiment. -version: 1.1.0 +version: 1.2.0 environment: - sdk: ">=2.12.0-29 <3.0.0" - flutter: ">=1.24.0-3.0" + sdk: ">=2.12.0 <3.0.0" + flutter: ">=2.0.0" dependencies: flutter: sdk: flutter - cupertino_icons: ^1.0.0 + cupertino_icons: ^1.0.2 dev_dependencies: flutter_test: diff --git a/experimental/null_safety/null_safe_app/test/widget_test.dart b/null_safety/null_safe_app/test/widget_test.dart similarity index 100% rename from experimental/null_safety/null_safe_app/test/widget_test.dart rename to null_safety/null_safe_app/test/widget_test.dart diff --git a/experimental/null_safety/null_safe_app/web/favicon.png b/null_safety/null_safe_app/web/favicon.png similarity index 100% rename from experimental/null_safety/null_safe_app/web/favicon.png rename to null_safety/null_safe_app/web/favicon.png diff --git a/experimental/null_safety/null_safe_app/web/icons/Icon-192.png b/null_safety/null_safe_app/web/icons/Icon-192.png similarity index 100% rename from experimental/null_safety/null_safe_app/web/icons/Icon-192.png rename to null_safety/null_safe_app/web/icons/Icon-192.png diff --git a/experimental/null_safety/null_safe_app/web/icons/Icon-512.png b/null_safety/null_safe_app/web/icons/Icon-512.png similarity index 100% rename from experimental/null_safety/null_safe_app/web/icons/Icon-512.png rename to null_safety/null_safe_app/web/icons/Icon-512.png diff --git a/experimental/null_safety/null_safe_app/web/index.html b/null_safety/null_safe_app/web/index.html similarity index 100% rename from experimental/null_safety/null_safe_app/web/index.html rename to null_safety/null_safe_app/web/index.html diff --git a/experimental/null_safety/null_safe_app/web/manifest.json b/null_safety/null_safe_app/web/manifest.json similarity index 100% rename from experimental/null_safety/null_safe_app/web/manifest.json rename to null_safety/null_safe_app/web/manifest.json diff --git a/experimental/null_safety/null_unsafe_app/.gitignore b/null_safety/null_unsafe_app/.gitignore similarity index 100% rename from experimental/null_safety/null_unsafe_app/.gitignore rename to null_safety/null_unsafe_app/.gitignore diff --git a/experimental/null_safety/null_unsafe_app/.metadata b/null_safety/null_unsafe_app/.metadata similarity index 100% rename from experimental/null_safety/null_unsafe_app/.metadata rename to null_safety/null_unsafe_app/.metadata diff --git a/experimental/null_safety/null_unsafe_app/README.md b/null_safety/null_unsafe_app/README.md similarity index 100% rename from experimental/null_safety/null_unsafe_app/README.md rename to null_safety/null_unsafe_app/README.md diff --git a/experimental/null_safety/null_unsafe_app/android/.gitignore b/null_safety/null_unsafe_app/android/.gitignore similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/.gitignore rename to null_safety/null_unsafe_app/android/.gitignore diff --git a/experimental/null_safety/null_unsafe_app/android/app/build.gradle b/null_safety/null_unsafe_app/android/app/build.gradle similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/build.gradle rename to null_safety/null_unsafe_app/android/app/build.gradle diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/debug/AndroidManifest.xml b/null_safety/null_unsafe_app/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/debug/AndroidManifest.xml rename to null_safety/null_unsafe_app/android/app/src/debug/AndroidManifest.xml diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml b/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml rename to null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/kotlin/com/example/null_unsafe_app/MainActivity.kt b/null_safety/null_unsafe_app/android/app/src/main/kotlin/com/example/null_unsafe_app/MainActivity.kt similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/kotlin/com/example/null_unsafe_app/MainActivity.kt rename to null_safety/null_unsafe_app/android/app/src/main/kotlin/com/example/null_unsafe_app/MainActivity.kt diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml b/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml rename to null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to null_safety/null_unsafe_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to null_safety/null_unsafe_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to null_safety/null_unsafe_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml b/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml rename to null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml b/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml rename to null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml diff --git a/experimental/null_safety/null_unsafe_app/android/app/src/profile/AndroidManifest.xml b/null_safety/null_unsafe_app/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/app/src/profile/AndroidManifest.xml rename to null_safety/null_unsafe_app/android/app/src/profile/AndroidManifest.xml diff --git a/experimental/null_safety/null_unsafe_app/android/build.gradle b/null_safety/null_unsafe_app/android/build.gradle similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/build.gradle rename to null_safety/null_unsafe_app/android/build.gradle diff --git a/experimental/null_safety/null_unsafe_app/android/gradle.properties b/null_safety/null_unsafe_app/android/gradle.properties similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/gradle.properties rename to null_safety/null_unsafe_app/android/gradle.properties diff --git a/experimental/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties b/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties rename to null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties diff --git a/experimental/null_safety/null_unsafe_app/android/settings.gradle b/null_safety/null_unsafe_app/android/settings.gradle similarity index 100% rename from experimental/null_safety/null_unsafe_app/android/settings.gradle rename to null_safety/null_unsafe_app/android/settings.gradle diff --git a/experimental/null_safety/null_unsafe_app/ios/.gitignore b/null_safety/null_unsafe_app/ios/.gitignore similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/.gitignore rename to null_safety/null_unsafe_app/ios/.gitignore diff --git a/experimental/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist b/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist rename to null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist diff --git a/experimental/null_safety/null_unsafe_app/ios/Flutter/Debug.xcconfig b/null_safety/null_unsafe_app/ios/Flutter/Debug.xcconfig similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Flutter/Debug.xcconfig rename to null_safety/null_unsafe_app/ios/Flutter/Debug.xcconfig diff --git a/experimental/null_safety/null_unsafe_app/ios/Flutter/Release.xcconfig b/null_safety/null_unsafe_app/ios/Flutter/Release.xcconfig similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Flutter/Release.xcconfig rename to null_safety/null_unsafe_app/ios/Flutter/Release.xcconfig diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj rename to null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to null_safety/null_unsafe_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcworkspace/contents.xcworkspacedata b/null_safety/null_unsafe_app/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcworkspace/contents.xcworkspacedata rename to null_safety/null_unsafe_app/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to null_safety/null_unsafe_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/AppDelegate.swift b/null_safety/null_unsafe_app/ios/Runner/AppDelegate.swift similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/AppDelegate.swift rename to null_safety/null_unsafe_app/ios/Runner/AppDelegate.swift diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to null_safety/null_unsafe_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/null_safety/null_unsafe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to null_safety/null_unsafe_app/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Base.lproj/Main.storyboard b/null_safety/null_unsafe_app/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Base.lproj/Main.storyboard rename to null_safety/null_unsafe_app/ios/Runner/Base.lproj/Main.storyboard diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Info.plist b/null_safety/null_unsafe_app/ios/Runner/Info.plist similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Info.plist rename to null_safety/null_unsafe_app/ios/Runner/Info.plist diff --git a/experimental/null_safety/null_unsafe_app/ios/Runner/Runner-Bridging-Header.h b/null_safety/null_unsafe_app/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from experimental/null_safety/null_unsafe_app/ios/Runner/Runner-Bridging-Header.h rename to null_safety/null_unsafe_app/ios/Runner/Runner-Bridging-Header.h diff --git a/experimental/null_safety/null_unsafe_app/lib/main.dart b/null_safety/null_unsafe_app/lib/main.dart similarity index 100% rename from experimental/null_safety/null_unsafe_app/lib/main.dart rename to null_safety/null_unsafe_app/lib/main.dart diff --git a/experimental/null_safety/null_unsafe_app/pubspec.lock b/null_safety/null_unsafe_app/pubspec.lock similarity index 100% rename from experimental/null_safety/null_unsafe_app/pubspec.lock rename to null_safety/null_unsafe_app/pubspec.lock diff --git a/experimental/null_safety/null_unsafe_app/pubspec.yaml b/null_safety/null_unsafe_app/pubspec.yaml similarity index 100% rename from experimental/null_safety/null_unsafe_app/pubspec.yaml rename to null_safety/null_unsafe_app/pubspec.yaml diff --git a/experimental/null_safety/null_unsafe_app/test/widget_test.dart b/null_safety/null_unsafe_app/test/widget_test.dart similarity index 100% rename from experimental/null_safety/null_unsafe_app/test/widget_test.dart rename to null_safety/null_unsafe_app/test/widget_test.dart diff --git a/experimental/null_safety/null_unsafe_app/web/favicon.png b/null_safety/null_unsafe_app/web/favicon.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/web/favicon.png rename to null_safety/null_unsafe_app/web/favicon.png diff --git a/experimental/null_safety/null_unsafe_app/web/icons/Icon-192.png b/null_safety/null_unsafe_app/web/icons/Icon-192.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/web/icons/Icon-192.png rename to null_safety/null_unsafe_app/web/icons/Icon-192.png diff --git a/experimental/null_safety/null_unsafe_app/web/icons/Icon-512.png b/null_safety/null_unsafe_app/web/icons/Icon-512.png similarity index 100% rename from experimental/null_safety/null_unsafe_app/web/icons/Icon-512.png rename to null_safety/null_unsafe_app/web/icons/Icon-512.png diff --git a/experimental/null_safety/null_unsafe_app/web/index.html b/null_safety/null_unsafe_app/web/index.html similarity index 100% rename from experimental/null_safety/null_unsafe_app/web/index.html rename to null_safety/null_unsafe_app/web/index.html diff --git a/experimental/null_safety/null_unsafe_app/web/manifest.json b/null_safety/null_unsafe_app/web/manifest.json similarity index 100% rename from experimental/null_safety/null_unsafe_app/web/manifest.json rename to null_safety/null_unsafe_app/web/manifest.json diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index b7d546ad9..e8c92bd0d 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -28,8 +28,8 @@ declare -ar PROJECT_NAMES=( # "testing_app" \ # Tracking issue: https://github.com/flutter/samples/issues/659 # "experimental/federated_plugin/federated_plugin" \ - "experimental/null_safety/null_safe_app" \ - "experimental/null_safety/null_unsafe_app" \ + "null_safety/null_safe_app" \ + "null_safety/null_unsafe_app" \ "experimental/veggieseasons" \ "experimental/web_dashboard" \ ) diff --git a/tool/flutter_ci_script_dev.sh b/tool/flutter_ci_script_dev.sh index d2a02559d..1d0c066cb 100755 --- a/tool/flutter_ci_script_dev.sh +++ b/tool/flutter_ci_script_dev.sh @@ -30,8 +30,8 @@ declare -ar PROJECT_NAMES=( "experimental/desktop_photo_search" \ # https://github.com/flutter/samples/issues/659 # "experimental/federated_plugin/federated_plugin" \ - "experimental/null_safety/null_safe_app" \ - "experimental/null_safety/null_unsafe_app" \ + "null_safety/null_safe_app" \ + "null_safety/null_unsafe_app" \ "experimental/veggieseasons" \ "experimental/web_dashboard" \ ) diff --git a/tool/flutter_ci_script_stable.sh b/tool/flutter_ci_script_stable.sh index df43f8670..e5a3e4eb5 100755 --- a/tool/flutter_ci_script_stable.sh +++ b/tool/flutter_ci_script_stable.sh @@ -21,6 +21,8 @@ declare -ar PROJECT_NAMES=( "provider_counter" \ "provider_shopper" \ "testing_app" \ + "null_safety/null_safe_app" \ + "null_safety/null_unsafe_app" \ # TODO(goderbauer): Add veggieseasons back when moved out of experimental again. # "veggieseasons" \ )