diff --git a/add_to_app/android_view/flutter_module_using_plugin/lib/cell.dart b/add_to_app/android_view/flutter_module_using_plugin/lib/cell.dart index 15e6da3c8..7c6b66656 100644 --- a/add_to_app/android_view/flutter_module_using_plugin/lib/cell.dart +++ b/add_to_app/android_view/flutter_module_using_plugin/lib/cell.dart @@ -94,7 +94,7 @@ class _CellState extends State with WidgetsBindingObserver { // Show a number provided by the platform based on // the cell's index. cellNumber.toString(), - style: Theme.of(context).textTheme.headline3, + style: Theme.of(context).textTheme.displaySmall, ), ], ), diff --git a/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart b/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart index 15bfd5e82..e3480ba62 100644 --- a/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart +++ b/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart @@ -141,14 +141,14 @@ class Contents extends StatelessWidget { Text( 'Window is ${mediaInfo.size.width.toStringAsFixed(1)} x ' '${mediaInfo.size.height.toStringAsFixed(1)}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 16), Consumer( builder: (context, model, child) { return Text( 'Taps: ${model.count}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ); }, ), diff --git a/add_to_app/fullscreen/flutter_module/lib/main.dart b/add_to_app/fullscreen/flutter_module/lib/main.dart index 475961a0a..3cd02f09b 100644 --- a/add_to_app/fullscreen/flutter_module/lib/main.dart +++ b/add_to_app/fullscreen/flutter_module/lib/main.dart @@ -128,14 +128,14 @@ class Contents extends StatelessWidget { Text( 'Window is ${mediaInfo.size.width.toStringAsFixed(1)} x ' '${mediaInfo.size.height.toStringAsFixed(1)}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 16), Consumer( builder: (context, model, child) { return Text( 'Taps: ${model.count}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ); }, ), diff --git a/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart b/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart index 6d022d0da..771904b11 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart +++ b/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart @@ -79,7 +79,7 @@ class _MyHomePageState extends State { ), Text( '$_counter', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), TextButton( onPressed: _incrementCounter, diff --git a/add_to_app/plugin/flutter_module_using_plugin/lib/cell.dart b/add_to_app/plugin/flutter_module_using_plugin/lib/cell.dart index a91c41425..39186b0bb 100644 --- a/add_to_app/plugin/flutter_module_using_plugin/lib/cell.dart +++ b/add_to_app/plugin/flutter_module_using_plugin/lib/cell.dart @@ -94,7 +94,7 @@ class _CellState extends State with WidgetsBindingObserver { // Show a number provided by the platform based on // the cell's index. cellNumber.toString(), - style: Theme.of(context).textTheme.headline3, + style: Theme.of(context).textTheme.displaySmall, ), ], ), diff --git a/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart b/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart index 9b9c2294a..d65648ed6 100644 --- a/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart +++ b/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart @@ -140,14 +140,14 @@ class Contents extends StatelessWidget { Text( 'Window is ${mediaInfo.size.width.toStringAsFixed(1)} x ' '${mediaInfo.size.height.toStringAsFixed(1)}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 16), Consumer( builder: (context, model, child) { return Text( 'Taps: ${model.count}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ); }, ), diff --git a/add_to_app/prebuilt_module/flutter_module/lib/main.dart b/add_to_app/prebuilt_module/flutter_module/lib/main.dart index 9248db3e5..9f32725a0 100644 --- a/add_to_app/prebuilt_module/flutter_module/lib/main.dart +++ b/add_to_app/prebuilt_module/flutter_module/lib/main.dart @@ -128,14 +128,14 @@ class Contents extends StatelessWidget { Text( 'Window is ${mediaInfo.size.width.toStringAsFixed(1)} x ' '${mediaInfo.size.height.toStringAsFixed(1)}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 16), Consumer( builder: (context, model, child) { return Text( 'Taps: ${model.count}', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ); }, ), diff --git a/android_splash_screen/lib/main.dart b/android_splash_screen/lib/main.dart index 7f0986a77..08057a129 100644 --- a/android_splash_screen/lib/main.dart +++ b/android_splash_screen/lib/main.dart @@ -69,7 +69,7 @@ class _MyHomePageState extends State { ), Text( '$_counter', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), ], ), diff --git a/animations/.metadata b/animations/.metadata index 39f2501e1..31b763f97 100644 --- a/animations/.metadata +++ b/animations/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/animations/android/gradle/wrapper/gradle-wrapper.properties b/animations/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/animations/android/gradle/wrapper/gradle-wrapper.properties +++ b/animations/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/animations/ios/Flutter/AppFrameworkInfo.plist b/animations/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/animations/ios/Flutter/AppFrameworkInfo.plist +++ b/animations/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/animations/ios/Podfile b/animations/ios/Podfile index 1e8c3c90a..88359b225 100644 --- a/animations/ios/Podfile +++ b/animations/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/animations/ios/Runner.xcodeproj/project.pbxproj b/animations/ios/Runner.xcodeproj/project.pbxproj index b76264eef..00729aa71 100644 --- a/animations/ios/Runner.xcodeproj/project.pbxproj +++ b/animations/ios/Runner.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -349,7 +349,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -398,7 +398,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/animations/ios/Runner/Info.plist b/animations/ios/Runner/Info.plist index facc1f256..2bad29459 100644 --- a/animations/ios/Runner/Info.plist +++ b/animations/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/animations/lib/main.dart b/animations/lib/main.dart index 4240ff09f..31d4afea6 100644 --- a/animations/lib/main.dart +++ b/animations/lib/main.dart @@ -179,7 +179,7 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { - final headerStyle = Theme.of(context).textTheme.headline6; + final headerStyle = Theme.of(context).textTheme.titleLarge; return Scaffold( appBar: AppBar( title: const Text('Animation Samples'), diff --git a/animations/lib/src/basics/02_page_route_builder.dart b/animations/lib/src/basics/02_page_route_builder.dart index 4675e4620..f37f665d3 100644 --- a/animations/lib/src/basics/02_page_route_builder.dart +++ b/animations/lib/src/basics/02_page_route_builder.dart @@ -50,7 +50,8 @@ class _Page2 extends StatelessWidget { title: const Text('Page 2'), ), body: Center( - child: Text('Page 2!', style: Theme.of(context).textTheme.headline4), + child: + Text('Page 2!', style: Theme.of(context).textTheme.headlineMedium), ), ); } diff --git a/animations/lib/src/basics/03_animation_controller.dart b/animations/lib/src/basics/03_animation_controller.dart index c87d35256..186fa5c8f 100644 --- a/animations/lib/src/basics/03_animation_controller.dart +++ b/animations/lib/src/basics/03_animation_controller.dart @@ -65,7 +65,7 @@ class _AnimationControllerDemoState extends State constraints: const BoxConstraints(maxWidth: 200), child: Text( controller.value.toStringAsFixed(2), - style: Theme.of(context).textTheme.headline3, + style: Theme.of(context).textTheme.displaySmall, textScaleFactor: 1 + controller.value, ), ), diff --git a/animations/lib/src/misc/curved_animation.dart b/animations/lib/src/misc/curved_animation.dart index 12f1b46a3..67ed01318 100644 --- a/animations/lib/src/misc/curved_animation.dart +++ b/animations/lib/src/misc/curved_animation.dart @@ -94,7 +94,7 @@ class _CurvedAnimationDemoState extends State const SizedBox(height: 20.0), Text( 'Select Curve for forward motion', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), DropdownButton( items: curves.map((curve) { @@ -114,7 +114,7 @@ class _CurvedAnimationDemoState extends State const SizedBox(height: 15.0), Text( 'Select Curve for reverse motion', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), DropdownButton( items: curves.map((curve) { diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/animations/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/animations/windows/runner/CMakeLists.txt b/animations/windows/runner/CMakeLists.txt index b9e550fba..17411a8ab 100644 --- a/animations/windows/runner/CMakeLists.txt +++ b/animations/windows/runner/CMakeLists.txt @@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") diff --git a/animations/windows/runner/Runner.rc b/animations/windows/runner/Runner.rc index 5f4fb2720..8bd0309cc 100644 --- a/animations/windows/runner/Runner.rc +++ b/animations/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/animations/windows/runner/runner.exe.manifest b/animations/windows/runner/runner.exe.manifest index c977c4a42..a42ea7687 100644 --- a/animations/windows/runner/runner.exe.manifest +++ b/animations/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/desktop_photo_search/fluent_ui/.metadata b/desktop_photo_search/fluent_ui/.metadata index a8fe59a1d..21064dafa 100644 --- a/desktop_photo_search/fluent_ui/.metadata +++ b/desktop_photo_search/fluent_ui/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - channel: beta + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + channel: stable project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj index 441bf6d1e..baa045c4c 100644 --- a/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj +++ b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj @@ -21,12 +21,12 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 1466779606FB1CE825B1465E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B02A6160A24E69A8234C4643 /* Pods_Runner.framework */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 7673FDB661ADFD2C35306121 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6833E8937A37A1F115F743FE /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,6 +53,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 32C17CF456FA01211B439433 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktop_photo_search.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -67,12 +68,11 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 5C3662BCAB0C08E8294CC9B1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 6FF7B7AC09DE996CDF6C9D16 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 599D52A0E16EABE549161D49 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6833E8937A37A1F115F743FE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - B02A6160A24E69A8234C4643 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D60EBD7F6771E871580DEFD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + BEB9965F4AE1BA304D5D3C01 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1466779606FB1CE825B1465E /* Pods_Runner.framework in Frameworks */, + 7673FDB661ADFD2C35306121 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 8152A8839F3CF1237999FBE4 /* Pods */, + BAF2CB65062ACABE2C155E8A /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - 8152A8839F3CF1237999FBE4 /* Pods */ = { + BAF2CB65062ACABE2C155E8A /* Pods */ = { isa = PBXGroup; children = ( - 6FF7B7AC09DE996CDF6C9D16 /* Pods-Runner.debug.xcconfig */, - 5C3662BCAB0C08E8294CC9B1 /* Pods-Runner.release.xcconfig */, - D60EBD7F6771E871580DEFD5 /* Pods-Runner.profile.xcconfig */, + 599D52A0E16EABE549161D49 /* Pods-Runner.debug.xcconfig */, + BEB9965F4AE1BA304D5D3C01 /* Pods-Runner.release.xcconfig */, + 32C17CF456FA01211B439433 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - B02A6160A24E69A8234C4643 /* Pods_Runner.framework */, + 6833E8937A37A1F115F743FE /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 44D97A05ED9D4C9B23C08AF7 /* [CP] Check Pods Manifest.lock */, + E652BF6B00D81FB654A74210 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - F932AB53040AFFE507EC30EE /* [CP] Embed Pods Frameworks */, + 8F5FF20051C1504DAEBF14FC /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -291,7 +291,24 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 44D97A05ED9D4C9B23C08AF7 /* [CP] Check Pods Manifest.lock */ = { + 8F5FF20051C1504DAEBF14FC /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + E652BF6B00D81FB654A74210 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -313,23 +330,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F932AB53040AFFE507EC30EE /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/desktop_photo_search/material/.metadata b/desktop_photo_search/material/.metadata index a8fe59a1d..21064dafa 100644 --- a/desktop_photo_search/material/.metadata +++ b/desktop_photo_search/material/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - channel: beta + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + channel: stable project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj b/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj index c6fc79112..ba5de86cc 100644 --- a/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj +++ b/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - AE9E1B8A00943278FA4ACC03 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A1C010444168881F90C76A7 /* Pods_Runner.framework */; }; + 528B573A6E81026EA11AEB8D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5782356BA8E4B0057FE9A963 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -67,12 +67,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 474DA1185735E1A2A8E435DF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 5A1C010444168881F90C76A7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3AD026BABE349D185A4D93B7 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 5782356BA8E4B0057FE9A963 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 64501C6F5F2839B91ADA3180 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 8529115BD75AB77C82E4867B /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - CC5B605A81EF7B6ABDCD0FEE /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - ECF60CEB98EC4BC59BD9AD53 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - AE9E1B8A00943278FA4ACC03 /* Pods_Runner.framework in Frameworks */, + 528B573A6E81026EA11AEB8D /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - E509AF1F032CA0C2DF5184B1 /* Pods */, + A91AE06AFDB4D62F44D069E0 /* Pods */, ); sourceTree = ""; }; @@ -152,25 +152,25 @@ path = Runner; sourceTree = ""; }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { + A91AE06AFDB4D62F44D069E0 /* Pods */ = { isa = PBXGroup; children = ( - 5A1C010444168881F90C76A7 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - E509AF1F032CA0C2DF5184B1 /* Pods */ = { - isa = PBXGroup; - children = ( - CC5B605A81EF7B6ABDCD0FEE /* Pods-Runner.debug.xcconfig */, - 474DA1185735E1A2A8E435DF /* Pods-Runner.release.xcconfig */, - ECF60CEB98EC4BC59BD9AD53 /* Pods-Runner.profile.xcconfig */, + 8529115BD75AB77C82E4867B /* Pods-Runner.debug.xcconfig */, + 3AD026BABE349D185A4D93B7 /* Pods-Runner.release.xcconfig */, + 64501C6F5F2839B91ADA3180 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 5782356BA8E4B0057FE9A963 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C1324E32219C85A3F295EDBA /* [CP] Check Pods Manifest.lock */, + 44FB96AE2ECE225B570F214F /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - C7CCB047D7C8715D61D5AFF7 /* [CP] Embed Pods Frameworks */, + 0836B9381C5D9C235B9BEB93 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,6 +254,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0836B9381C5D9C235B9BEB93 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -291,7 +308,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - C1324E32219C85A3F295EDBA /* [CP] Check Pods Manifest.lock */ = { + 44FB96AE2ECE225B570F214F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -313,23 +330,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C7CCB047D7C8715D61D5AFF7 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/experimental/federated_plugin/federated_plugin/example/lib/main.dart b/experimental/federated_plugin/federated_plugin/example/lib/main.dart index 3aef6dc78..e8ddda607 100644 --- a/experimental/federated_plugin/federated_plugin/example/lib/main.dart +++ b/experimental/federated_plugin/federated_plugin/example/lib/main.dart @@ -46,7 +46,7 @@ class _HomePageState extends State { ? const SizedBox.shrink() : Text( 'Battery Level: $batteryLevel', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 16), ElevatedButton( diff --git a/experimental/linting_tool/lib/pages/default_rules_page.dart b/experimental/linting_tool/lib/pages/default_rules_page.dart index 2161704cc..6e411d361 100644 --- a/experimental/linting_tool/lib/pages/default_rules_page.dart +++ b/experimental/linting_tool/lib/pages/default_rules_page.dart @@ -35,8 +35,8 @@ class DefaultRulesPage extends StatelessWidget { appBar: AppBar( title: Text( profile.name, - style: textTheme.subtitle2!.copyWith( - color: textTheme.bodyText1!.color, + style: textTheme.titleSmall!.copyWith( + color: textTheme.bodyLarge!.color, ), ), leading: Padding( diff --git a/experimental/linting_tool/lib/pages/rules_page.dart b/experimental/linting_tool/lib/pages/rules_page.dart index a5e27899b..77ca1ab1d 100644 --- a/experimental/linting_tool/lib/pages/rules_page.dart +++ b/experimental/linting_tool/lib/pages/rules_page.dart @@ -41,8 +41,8 @@ class RulesPage extends StatelessWidget { .read() .savedProfiles[selectedProfileIndex] .name, - style: textTheme.subtitle2!.copyWith( - color: textTheme.bodyText1!.color, + style: textTheme.titleSmall!.copyWith( + color: textTheme.bodyLarge!.color, ), ), leading: Padding( diff --git a/experimental/linting_tool/lib/theme/app_theme.dart b/experimental/linting_tool/lib/theme/app_theme.dart index 1c0bf4b91..30ecb77b1 100644 --- a/experimental/linting_tool/lib/theme/app_theme.dart +++ b/experimental/linting_tool/lib/theme/app_theme.dart @@ -22,14 +22,14 @@ abstract class AppTheme { color: AppColors.orange500, ), selectedLabelTextStyle: - GoogleFonts.workSansTextTheme().headline5!.copyWith( + GoogleFonts.workSansTextTheme().headlineSmall!.copyWith( color: AppColors.orange500, ), unselectedIconTheme: const IconThemeData( color: AppColors.blue200, ), unselectedLabelTextStyle: - GoogleFonts.workSansTextTheme().headline5!.copyWith( + GoogleFonts.workSansTextTheme().headlineSmall!.copyWith( color: AppColors.blue200, ), ), @@ -62,14 +62,14 @@ abstract class AppTheme { color: AppColors.orange300, ), selectedLabelTextStyle: - GoogleFonts.workSansTextTheme().headline5!.copyWith( + GoogleFonts.workSansTextTheme().headlineSmall!.copyWith( color: AppColors.orange300, ), unselectedIconTheme: const IconThemeData( color: AppColors.greyLabel, ), unselectedLabelTextStyle: - GoogleFonts.workSansTextTheme().headline5!.copyWith( + GoogleFonts.workSansTextTheme().headlineSmall!.copyWith( color: AppColors.greyLabel, ), ), @@ -109,56 +109,56 @@ abstract class AppTheme { secondarySelectedColor: chipBackground, padding: const EdgeInsets.all(4), shape: const StadiumBorder(), - labelStyle: GoogleFonts.workSansTextTheme().bodyText2!.copyWith( + labelStyle: GoogleFonts.workSansTextTheme().bodyMedium!.copyWith( color: brightness == Brightness.dark ? AppColors.white50 : AppColors.black900, ), - secondaryLabelStyle: GoogleFonts.workSansTextTheme().bodyText2!, + secondaryLabelStyle: GoogleFonts.workSansTextTheme().bodyMedium!, brightness: brightness, ); } static TextTheme _buildReplyLightTextTheme(TextTheme base) { return base.copyWith( - headline4: GoogleFonts.workSans( + headlineMedium: GoogleFonts.workSans( fontWeight: FontWeight.w600, fontSize: 34, letterSpacing: 0.4, height: 0.9, color: AppColors.black900, ), - headline5: GoogleFonts.workSans( + headlineSmall: GoogleFonts.workSans( fontWeight: FontWeight.bold, fontSize: 24, letterSpacing: 0.27, color: AppColors.black900, ), - headline6: GoogleFonts.workSans( + titleLarge: GoogleFonts.workSans( fontWeight: FontWeight.w600, fontSize: 20, letterSpacing: 0.18, color: AppColors.black900, ), - subtitle2: GoogleFonts.workSans( + titleSmall: GoogleFonts.workSans( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing: -0.04, color: AppColors.black900, ), - bodyText1: GoogleFonts.workSans( + bodyLarge: GoogleFonts.workSans( fontWeight: FontWeight.normal, fontSize: 18, letterSpacing: 0.2, color: AppColors.black900, ), - bodyText2: GoogleFonts.workSans( + bodyMedium: GoogleFonts.workSans( fontWeight: FontWeight.normal, fontSize: 14, letterSpacing: -0.05, color: AppColors.black900, ), - caption: GoogleFonts.workSans( + bodySmall: GoogleFonts.workSans( fontWeight: FontWeight.normal, fontSize: 12, letterSpacing: 0.2, @@ -169,44 +169,44 @@ abstract class AppTheme { static TextTheme _buildReplyDarkTextTheme(TextTheme base) { return base.copyWith( - headline4: GoogleFonts.workSans( + headlineMedium: GoogleFonts.workSans( fontWeight: FontWeight.w600, fontSize: 34, letterSpacing: 0.4, height: 0.9, color: AppColors.white50, ), - headline5: GoogleFonts.workSans( + headlineSmall: GoogleFonts.workSans( fontWeight: FontWeight.bold, fontSize: 24, letterSpacing: 0.27, color: AppColors.white50, ), - headline6: GoogleFonts.workSans( + titleLarge: GoogleFonts.workSans( fontWeight: FontWeight.w600, fontSize: 20, letterSpacing: 0.18, color: AppColors.white50, ), - subtitle2: GoogleFonts.workSans( + titleSmall: GoogleFonts.workSans( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing: -0.04, color: AppColors.white50, ), - bodyText1: GoogleFonts.workSans( + bodyLarge: GoogleFonts.workSans( fontWeight: FontWeight.normal, fontSize: 18, letterSpacing: 0.2, color: AppColors.white50, ), - bodyText2: GoogleFonts.workSans( + bodyMedium: GoogleFonts.workSans( fontWeight: FontWeight.normal, fontSize: 14, letterSpacing: -0.05, color: AppColors.white50, ), - caption: GoogleFonts.workSans( + bodySmall: GoogleFonts.workSans( fontWeight: FontWeight.normal, fontSize: 12, letterSpacing: 0.2, @@ -218,8 +218,8 @@ abstract class AppTheme { static MarkdownStyleSheet buildMarkDownTheme(ThemeData theme) { final textTheme = theme.textTheme; return MarkdownStyleSheet.largeFromTheme(theme).copyWith( - strong: textTheme.subtitle2!, - em: textTheme.bodyText2!.copyWith( + strong: textTheme.titleSmall!, + em: textTheme.bodyMedium!.copyWith( fontWeight: FontWeight.w900, fontStyle: FontStyle.italic, ), diff --git a/experimental/linting_tool/lib/widgets/adaptive_nav.dart b/experimental/linting_tool/lib/widgets/adaptive_nav.dart index 1a801265c..199fb5567 100644 --- a/experimental/linting_tool/lib/widgets/adaptive_nav.dart +++ b/experimental/linting_tool/lib/widgets/adaptive_nav.dart @@ -96,8 +96,8 @@ class _NavViewState extends State<_NavView> { appBar: AppBar( title: Text( 'Flutter Linting Tool', - style: textTheme.subtitle2!.copyWith( - color: textTheme.bodyText1!.color, + style: textTheme.titleSmall!.copyWith( + color: textTheme.bodyLarge!.color, ), ), toolbarHeight: 38.0, @@ -218,7 +218,7 @@ class _NavigationRailHeader extends StatelessWidget { opacity: animation.value, child: Text( 'Linting Tool', - style: textTheme.bodyText1!.copyWith( + style: textTheme.bodyLarge!.copyWith( color: AppColors.white50, ), ), @@ -298,7 +298,7 @@ class _NavigationRailTrailingSection extends StatelessWidget { const SizedBox(width: 24), Text( item, - style: textTheme.bodyText1!.copyWith( + style: textTheme.bodyLarge!.copyWith( color: navigationRailTheme .unselectedLabelTextStyle!.color, ), diff --git a/experimental/linting_tool/lib/widgets/lint_expansion_tile.dart b/experimental/linting_tool/lib/widgets/lint_expansion_tile.dart index c02c78a1b..94836f3fb 100644 --- a/experimental/linting_tool/lib/widgets/lint_expansion_tile.dart +++ b/experimental/linting_tool/lib/widgets/lint_expansion_tile.dart @@ -38,13 +38,13 @@ class _LintExpansionTileState extends State { collapsedBackgroundColor: AppColors.white50, title: Text( rule.name, - style: textTheme.subtitle1!.copyWith( + style: textTheme.titleMedium!.copyWith( fontWeight: FontWeight.w700, ), ), subtitle: Text( rule.description, - style: textTheme.caption!, + style: textTheme.bodySmall!, ), initiallyExpanded: isExpanded, onExpansionChanged: (value) { @@ -66,7 +66,7 @@ class _LintExpansionTileState extends State { children: [ TextSpan( text: 'Group:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' ${rule.group}', @@ -80,7 +80,7 @@ class _LintExpansionTileState extends State { children: [ TextSpan( text: 'Maturity:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' ${rule.maturity}', @@ -94,7 +94,7 @@ class _LintExpansionTileState extends State { children: [ TextSpan( text: 'Incompatible:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' $incompatibleString', @@ -108,7 +108,7 @@ class _LintExpansionTileState extends State { children: [ TextSpan( text: 'Sets:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' $setsString', diff --git a/experimental/linting_tool/lib/widgets/saved_rule_tile.dart b/experimental/linting_tool/lib/widgets/saved_rule_tile.dart index d5f695f92..853383140 100644 --- a/experimental/linting_tool/lib/widgets/saved_rule_tile.dart +++ b/experimental/linting_tool/lib/widgets/saved_rule_tile.dart @@ -60,13 +60,13 @@ class _SavedRuleTileState extends State { : null, title: Text( rule.name, - style: textTheme.subtitle1!.copyWith( + style: textTheme.titleMedium!.copyWith( fontWeight: FontWeight.w700, ), ), subtitle: Text( rule.description, - style: textTheme.caption!, + style: textTheme.bodySmall!, ), initiallyExpanded: isExpanded, onExpansionChanged: (value) { @@ -88,7 +88,7 @@ class _SavedRuleTileState extends State { children: [ TextSpan( text: 'Group:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' ${rule.group}', @@ -102,7 +102,7 @@ class _SavedRuleTileState extends State { children: [ TextSpan( text: 'Maturity:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' ${rule.maturity}', @@ -116,7 +116,7 @@ class _SavedRuleTileState extends State { children: [ TextSpan( text: 'Incompatible:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' $incompatibleString', @@ -130,7 +130,7 @@ class _SavedRuleTileState extends State { children: [ TextSpan( text: 'Sets:', - style: textTheme.subtitle2, + style: textTheme.titleSmall, ), TextSpan( text: ' $setsString', diff --git a/flutter_maps_firestore/.metadata b/flutter_maps_firestore/.metadata index 5df5c7a0e..df924690f 100644 --- a/flutter_maps_firestore/.metadata +++ b/flutter_maps_firestore/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/flutter_maps_firestore/codelab_rebuild.yaml b/flutter_maps_firestore/codelab_rebuild.yaml index b6d9a800a..2cdc2badb 100644 --- a/flutter_maps_firestore/codelab_rebuild.yaml +++ b/flutter_maps_firestore/codelab_rebuild.yaml @@ -26,8 +26,8 @@ steps: +++ a/flutter_maps_firestore/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project - -# platform :ios, '9.0' - +platform :ios, '10.0' + -# platform :ios, '11.0' + +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -36,7 +36,7 @@ steps: installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| - + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0' + + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end end end @@ -49,8 +49,8 @@ steps: CFBundleVersion 1.0 MinimumOSVersion - - 9.0 - + 10.0 + - 11.0 + + 13.0 - name: Patch ios/Runner/AppDelegate.swift @@ -96,9 +96,9 @@ steps: CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - - name: flutter doctor - flutter: doctor + # - name: flutter doctor + # flutter: doctor - name: flutter pub upgrade flutter: pub upgrade --major-versions - - name: flutter build ios - flutter: build ios --simulator + # - name: flutter build ios + # flutter: build ios --simulator diff --git a/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist b/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist index ded19e291..1dc6cf765 100644 --- a/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist +++ b/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 10.0 + 13.0 diff --git a/flutter_maps_firestore/ios/Podfile b/flutter_maps_firestore/ios/Podfile index 916268ce2..02745cd00 100644 --- a/flutter_maps_firestore/ios/Podfile +++ b/flutter_maps_firestore/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -38,7 +38,7 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' end end end diff --git a/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj b/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj index 9e629c986..8b5758e72 100644 --- a/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj @@ -3,11 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ - 0BE006D4BFDA644D5B4CD33F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44DC1E94CA9F2BE67833D95E /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; @@ -32,11 +31,7 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1DAEB63F880D41F24B44B4EE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3E55A75C5B3E73CB2F02A020 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 44DC1E94CA9F2BE67833D95E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6060BBEAD25D3335D2142ED8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -47,7 +42,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AA86F84E289A7640008B9D0E /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "/Users/brettmorgan/Documents/GitHub/samples/flutter_maps_firestore/ios/GoogleService-Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,35 +49,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0BE006D4BFDA644D5B4CD33F /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6A8355B60F95E71D44431A79 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 44DC1E94CA9F2BE67833D95E /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 74E97556B41AACFB049CCA9B /* Pods */ = { - isa = PBXGroup; - children = ( - 6060BBEAD25D3335D2142ED8 /* Pods-Runner.debug.xcconfig */, - 3E55A75C5B3E73CB2F02A020 /* Pods-Runner.release.xcconfig */, - 1DAEB63F880D41F24B44B4EE /* Pods-Runner.profile.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - AA86F84E289A7640008B9D0E /* GoogleService-Info.plist */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -98,8 +72,6 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 74E97556B41AACFB049CCA9B /* Pods */, - 6A8355B60F95E71D44431A79 /* Frameworks */, ); sourceTree = ""; }; @@ -133,15 +105,12 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - AE1B0951F8BD8A32B87AA562 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - C2E5CA9C9FFC39807AED323B /* [CP] Embed Pods Frameworks */, - 9E122A7DED8D0076855CE581 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -158,7 +127,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1340; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -228,62 +197,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9E122A7DED8D0076855CE581 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - AE1B0951F8BD8A32B87AA562 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - C2E5CA9C9FFC39807AED323B /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -341,7 +254,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -360,7 +272,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -413,7 +325,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -438,7 +349,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -469,7 +380,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -488,7 +398,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/flutter_maps_firestore/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_maps_firestore/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a0f64538f..c87d15a33 100644 --- a/flutter_maps_firestore/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter_maps_firestore/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - diff --git a/flutter_maps_firestore/ios/Runner/Info.plist b/flutter_maps_firestore/ios/Runner/Info.plist index 8e080aaeb..941f776b3 100644 --- a/flutter_maps_firestore/ios/Runner/Info.plist +++ b/flutter_maps_firestore/ios/Runner/Info.plist @@ -47,5 +47,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/form_app/.metadata b/form_app/.metadata index ae91d3a9b..31b763f97 100644 --- a/form_app/.metadata +++ b/form_app/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - channel: beta + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/form_app/ios/Runner.xcodeproj/project.pbxproj b/form_app/ios/Runner.xcodeproj/project.pbxproj index d8d5923f7..47c04ae62 100644 --- a/form_app/ios/Runner.xcodeproj/project.pbxproj +++ b/form_app/ios/Runner.xcodeproj/project.pbxproj @@ -8,9 +8,9 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3766E7D372A09850A29A527B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87696D5D502580ADFBD15E31 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 9309D80CD50D14B12B3D5661 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB02F6700D6F522964B2F8E /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -30,15 +30,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0E909B33AFD434F306ACCA3C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 87696D5D502580ADFBD15E31 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8CCF6655111C0B16FDDC34F9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 7DF4AE70F222DD0D20BF7DFD /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -46,7 +44,9 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CFB78930BCED44AFB7692679 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + A6B1EA81047BB0E40C5F2E92 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + CBB02F6700D6F522964B2F8E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D12D113EB771D9D773656456 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,7 +54,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3766E7D372A09850A29A527B /* Pods_Runner.framework in Frameworks */, + 9309D80CD50D14B12B3D5661 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -78,8 +78,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - EF79CD33CFDCF74DE7C10B5A /* Pods */, - EF9128E56C18321704624C97 /* Frameworks */, + E0E3BF2EC2B3A6752223662D /* Pods */, + B2F3943E576ACDC6CB8912D7 /* Frameworks */, ); sourceTree = ""; }; @@ -106,25 +106,25 @@ path = Runner; sourceTree = ""; }; - EF79CD33CFDCF74DE7C10B5A /* Pods */ = { + B2F3943E576ACDC6CB8912D7 /* Frameworks */ = { isa = PBXGroup; children = ( - 0E909B33AFD434F306ACCA3C /* Pods-Runner.debug.xcconfig */, - CFB78930BCED44AFB7692679 /* Pods-Runner.release.xcconfig */, - 8CCF6655111C0B16FDDC34F9 /* Pods-Runner.profile.xcconfig */, + CBB02F6700D6F522964B2F8E /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + E0E3BF2EC2B3A6752223662D /* Pods */ = { + isa = PBXGroup; + children = ( + D12D113EB771D9D773656456 /* Pods-Runner.debug.xcconfig */, + 7DF4AE70F222DD0D20BF7DFD /* Pods-Runner.release.xcconfig */, + A6B1EA81047BB0E40C5F2E92 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - EF9128E56C18321704624C97 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 87696D5D502580ADFBD15E31 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -132,7 +132,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - F25D53060A56EAD76DB45362 /* [CP] Check Pods Manifest.lock */, + 846C56F022D8A4454E9D24A7 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -211,21 +211,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; - F25D53060A56EAD76DB45362 /* [CP] Check Pods Manifest.lock */ = { + 846C56F022D8A4454E9D24A7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -247,6 +233,20 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/form_app/lib/src/form_widgets.dart b/form_app/lib/src/form_widgets.dart index 0f69426e3..14b590f5a 100644 --- a/form_app/lib/src/form_widgets.dart +++ b/form_app/lib/src/form_widgets.dart @@ -83,7 +83,7 @@ class _FormWidgetsDemoState extends State { children: [ Text( 'Estimated value', - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), ], ), @@ -91,7 +91,7 @@ class _FormWidgetsDemoState extends State { intl.NumberFormat.currency( symbol: "\$", decimalDigits: 0) .format(maxValue), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), Slider( min: 0, @@ -119,7 +119,7 @@ class _FormWidgetsDemoState extends State { }, ), Text('Brushed Teeth', - style: Theme.of(context).textTheme.subtitle1), + style: Theme.of(context).textTheme.titleMedium), ], ), Row( @@ -127,7 +127,7 @@ class _FormWidgetsDemoState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text('Enable feature', - style: Theme.of(context).textTheme.bodyText1), + style: Theme.of(context).textTheme.bodyLarge), Switch( value: enableFeature, onChanged: (enabled) { @@ -184,11 +184,11 @@ class _FormDatePickerState extends State<_FormDatePicker> { children: [ Text( 'Date', - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), Text( intl.DateFormat.yMd().format(widget.date), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), diff --git a/form_app/lib/src/validation.dart b/form_app/lib/src/validation.dart index 74c1f4a97..5b3a1d35e 100644 --- a/form_app/lib/src/validation.dart +++ b/form_app/lib/src/validation.dart @@ -142,7 +142,7 @@ class _FormValidationDemoState extends State { ), Text( 'I agree to the terms of service.', - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), @@ -151,7 +151,7 @@ class _FormValidationDemoState extends State { formFieldState.errorText ?? "", style: Theme.of(context) .textTheme - .caption! + .bodySmall! .copyWith(color: Theme.of(context).errorColor), ), ], diff --git a/form_app/macos/Runner.xcodeproj/project.pbxproj b/form_app/macos/Runner.xcodeproj/project.pbxproj index f6bc14fce..c0acfdf9b 100644 --- a/form_app/macos/Runner.xcodeproj/project.pbxproj +++ b/form_app/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - A1F0BFFB6F9FA14106EAE3EE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 856473EAF8CF89E799479CE6 /* Pods_Runner.framework */; }; + A1A440F5C7D402943BD176C2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D1182B28AB63982A2B698B9F /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,7 +53,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 126F45D6E712A1389E6DCD35 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 16A054A9244A371E3C92CC62 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* form_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = form_app.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -69,10 +69,10 @@ 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 856473EAF8CF89E799479CE6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9059A008AAF982E2AA81E7FD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C967532271F6A636305589EE /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + BEC4A415B7EFDC4F01A3444C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D1182B28AB63982A2B698B9F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DD5507146441B996C58A6BEB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A1F0BFFB6F9FA14106EAE3EE /* Pods_Runner.framework in Frameworks */, + A1A440F5C7D402943BD176C2 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - A82934A73121DAFD6D1DB4E7 /* Pods */, + BEDA6D5CABD7E8684DDC3EE9 /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - A82934A73121DAFD6D1DB4E7 /* Pods */ = { + BEDA6D5CABD7E8684DDC3EE9 /* Pods */ = { isa = PBXGroup; children = ( - 9059A008AAF982E2AA81E7FD /* Pods-Runner.debug.xcconfig */, - C967532271F6A636305589EE /* Pods-Runner.release.xcconfig */, - 126F45D6E712A1389E6DCD35 /* Pods-Runner.profile.xcconfig */, + 16A054A9244A371E3C92CC62 /* Pods-Runner.debug.xcconfig */, + BEC4A415B7EFDC4F01A3444C /* Pods-Runner.release.xcconfig */, + DD5507146441B996C58A6BEB /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 856473EAF8CF89E799479CE6 /* Pods_Runner.framework */, + D1182B28AB63982A2B698B9F /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 1A8E813EC05C89AF241D66B7 /* [CP] Check Pods Manifest.lock */, + 2B0CC5BC0627E3F13363B344 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 8AAAE696263490D7C35ED98D /* [CP] Embed Pods Frameworks */, + 1E3430AC2670871C983C239E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,7 +254,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1A8E813EC05C89AF241D66B7 /* [CP] Check Pods Manifest.lock */ = { + 1E3430AC2670871C983C239E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 2B0CC5BC0627E3F13363B344 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -313,23 +330,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 8AAAE696263490D7C35ED98D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/game_template/lib/main.dart b/game_template/lib/main.dart index 23ef012d5..cce450def 100644 --- a/game_template/lib/main.dart +++ b/game_template/lib/main.dart @@ -251,7 +251,7 @@ class MyApp extends StatelessWidget { background: palette.backgroundMain, ), textTheme: TextTheme( - bodyText2: TextStyle( + bodyMedium: TextStyle( color: palette.ink, ), ), diff --git a/infinite_list/.metadata b/infinite_list/.metadata index 39f2501e1..31b763f97 100644 --- a/infinite_list/.metadata +++ b/infinite_list/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/infinite_list/android/gradle/wrapper/gradle-wrapper.properties b/infinite_list/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/infinite_list/android/gradle/wrapper/gradle-wrapper.properties +++ b/infinite_list/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/infinite_list/ios/Flutter/AppFrameworkInfo.plist b/infinite_list/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/infinite_list/ios/Flutter/AppFrameworkInfo.plist +++ b/infinite_list/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/infinite_list/ios/Podfile b/infinite_list/ios/Podfile index 1e8c3c90a..88359b225 100644 --- a/infinite_list/ios/Podfile +++ b/infinite_list/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/infinite_list/ios/Runner.xcodeproj/project.pbxproj b/infinite_list/ios/Runner.xcodeproj/project.pbxproj index 3586290dc..cb3e7d2be 100644 --- a/infinite_list/ios/Runner.xcodeproj/project.pbxproj +++ b/infinite_list/ios/Runner.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - E0A2EB0FB6FBE5C04FD68E5F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EA37D35940772D3A25CAB8E /* Pods_Runner.framework */; }; + C71D9A61228B6B41CE6FE2C3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE54738E98F1823E94841BE6 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -30,11 +30,12 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0DCE0234E48E2E444500A40F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1EA37D35940772D3A25CAB8E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D5E9F46C23C32B8159F71DB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3E65ACBD081D53FF6433024A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 717F2EEC09BE7FD5192FB899 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -45,8 +46,7 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D8935AA727BD9F97522C6A74 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - F4196E96775C3373A12FC485 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + CE54738E98F1823E94841BE6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,13 +54,24 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E0A2EB0FB6FBE5C04FD68E5F /* Pods_Runner.framework in Frameworks */, + C71D9A61228B6B41CE6FE2C3 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4FC4453B6F1E51736E90892D /* Pods */ = { + isa = PBXGroup; + children = ( + 717F2EEC09BE7FD5192FB899 /* Pods-Runner.debug.xcconfig */, + 3E65ACBD081D53FF6433024A /* Pods-Runner.release.xcconfig */, + 0DCE0234E48E2E444500A40F /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -78,8 +89,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - F9CC28950D90848346907DAB /* Pods */, - D8E5FD580974BD5F341F3121 /* Frameworks */, + 4FC4453B6F1E51736E90892D /* Pods */, + CD7D804D9918CA13D2A294C8 /* Frameworks */, ); sourceTree = ""; }; @@ -106,25 +117,14 @@ path = Runner; sourceTree = ""; }; - D8E5FD580974BD5F341F3121 /* Frameworks */ = { + CD7D804D9918CA13D2A294C8 /* Frameworks */ = { isa = PBXGroup; children = ( - 1EA37D35940772D3A25CAB8E /* Pods_Runner.framework */, + CE54738E98F1823E94841BE6 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; }; - F9CC28950D90848346907DAB /* Pods */ = { - isa = PBXGroup; - children = ( - F4196E96775C3373A12FC485 /* Pods-Runner.debug.xcconfig */, - 2D5E9F46C23C32B8159F71DB /* Pods-Runner.release.xcconfig */, - D8935AA727BD9F97522C6A74 /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -132,7 +132,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - E6A8D8B707A17B48B9BD1AB1 /* [CP] Check Pods Manifest.lock */, + E89B0FCFB1800CB14D0BE217 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -225,7 +225,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - E6A8D8B707A17B48B9BD1AB1 /* [CP] Check Pods Manifest.lock */ = { + E89B0FCFB1800CB14D0BE217 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -399,7 +399,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -448,7 +448,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/infinite_list/ios/Runner/Info.plist b/infinite_list/ios/Runner/Info.plist index a2c7ef0f1..a7b3a7fea 100644 --- a/infinite_list/ios/Runner/Info.plist +++ b/infinite_list/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/infinite_list/lib/src/item_tile.dart b/infinite_list/lib/src/item_tile.dart index 11f98def2..addccf797 100644 --- a/infinite_list/lib/src/item_tile.dart +++ b/infinite_list/lib/src/item_tile.dart @@ -24,7 +24,7 @@ class ItemTile extends StatelessWidget { color: item.color, ), ), - title: Text(item.name, style: Theme.of(context).textTheme.headline6), + title: Text(item.name, style: Theme.of(context).textTheme.titleLarge), trailing: Text('\$ ${(item.price / 100).toStringAsFixed(2)}'), ), ); @@ -45,7 +45,7 @@ class LoadingItemTile extends StatelessWidget { aspectRatio: 1, child: Placeholder(), ), - title: Text('...', style: Theme.of(context).textTheme.headline6), + title: Text('...', style: Theme.of(context).textTheme.titleLarge), trailing: const Text('\$ ...'), ), ); diff --git a/infinite_list/macos/Runner.xcodeproj/project.pbxproj b/infinite_list/macos/Runner.xcodeproj/project.pbxproj index f596f7d8e..8f1d1cd6c 100644 --- a/infinite_list/macos/Runner.xcodeproj/project.pbxproj +++ b/infinite_list/macos/Runner.xcodeproj/project.pbxproj @@ -21,12 +21,12 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 2A0DECCD063130CBA4CB790D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D58235BF2A8BE54A268190C /* Pods_Runner.framework */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - E7F344BF9D8682C1F27FE918 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FC8FA0445DC9FCDC9DC569 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,8 +53,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0EA7CCA7F3E5AABE79B4ADC8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 28FC8FA0445DC9FCDC9DC569 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0E885C260FB1468F8FC81D23 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 1E43FFAD1537435A9FE1F753 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* infinite_list.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = infinite_list.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -69,10 +69,10 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 49257F3C06F85C9E77C2BC31 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 80B871AD7C866D392F1A57EC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 7D58235BF2A8BE54A268190C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - B80FFF920544FE423F293EBA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E7F344BF9D8682C1F27FE918 /* Pods_Runner.framework in Frameworks */, + 2A0DECCD063130CBA4CB790D /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 9B14ACFDB02B51AA7D39247D /* Pods */, + AB7BB8D642D49CFDD34228CC /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - 9B14ACFDB02B51AA7D39247D /* Pods */ = { + AB7BB8D642D49CFDD34228CC /* Pods */ = { isa = PBXGroup; children = ( - B80FFF920544FE423F293EBA /* Pods-Runner.debug.xcconfig */, - 0EA7CCA7F3E5AABE79B4ADC8 /* Pods-Runner.release.xcconfig */, - 80B871AD7C866D392F1A57EC /* Pods-Runner.profile.xcconfig */, + 49257F3C06F85C9E77C2BC31 /* Pods-Runner.debug.xcconfig */, + 1E43FFAD1537435A9FE1F753 /* Pods-Runner.release.xcconfig */, + 0E885C260FB1468F8FC81D23 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 28FC8FA0445DC9FCDC9DC569 /* Pods_Runner.framework */, + 7D58235BF2A8BE54A268190C /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 6848D96977ABE013D61D4A6E /* [CP] Check Pods Manifest.lock */, + 4528C24D64EECF396000D69C /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 534A5B362DEB4030312DE6AC /* [CP] Embed Pods Frameworks */, + 1FD5401A6507EF597DF07B6B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,6 +254,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1FD5401A6507EF597DF07B6B /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -291,24 +308,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 534A5B362DEB4030312DE6AC /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 6848D96977ABE013D61D4A6E /* [CP] Check Pods Manifest.lock */ = { + 4528C24D64EECF396000D69C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/infinite_list/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/infinite_list/windows/runner/CMakeLists.txt b/infinite_list/windows/runner/CMakeLists.txt index b9e550fba..17411a8ab 100644 --- a/infinite_list/windows/runner/CMakeLists.txt +++ b/infinite_list/windows/runner/CMakeLists.txt @@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") diff --git a/infinite_list/windows/runner/Runner.rc b/infinite_list/windows/runner/Runner.rc index 33be1c3dc..1d49704ed 100644 --- a/infinite_list/windows/runner/Runner.rc +++ b/infinite_list/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/infinite_list/windows/runner/runner.exe.manifest b/infinite_list/windows/runner/runner.exe.manifest index c977c4a42..a42ea7687 100644 --- a/infinite_list/windows/runner/runner.exe.manifest +++ b/infinite_list/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/isolate_example/.metadata b/isolate_example/.metadata index 8dd2f8d13..49936cf1f 100644 --- a/isolate_example/.metadata +++ b/isolate_example/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - channel: beta + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + channel: stable project_type: app @@ -13,23 +13,23 @@ project_type: app migration: platforms: - platform: root - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/isolate_example/ios/Runner.xcodeproj/project.pbxproj b/isolate_example/ios/Runner.xcodeproj/project.pbxproj index f801253da..068b96bc9 100644 --- a/isolate_example/ios/Runner.xcodeproj/project.pbxproj +++ b/isolate_example/ios/Runner.xcodeproj/project.pbxproj @@ -9,11 +9,11 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 6B77D82B84B87C81CD50B227 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDA99BC2AB82371A95FD5323 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - AC608E16068F385AEACA3F87 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC754D59E082997D6D9D179 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -30,14 +30,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 009E4B54E92FB7C3805164F8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2647A05B96BF654A2BDA358C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 235262584023E15F3AA8FE80 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7B9D3CACBF0EBA46A469B3AD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -45,8 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A90DE1550AC49F788008717B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEC754D59E082997D6D9D179 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9E8C1395E9F6F51C305D4152 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + EDA99BC2AB82371A95FD5323 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,13 +54,32 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - AC608E16068F385AEACA3F87 /* Pods_Runner.framework in Frameworks */, + 6B77D82B84B87C81CD50B227 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0613C8A5252A93C033B43D50 /* Pods */ = { + isa = PBXGroup; + children = ( + 235262584023E15F3AA8FE80 /* Pods-Runner.debug.xcconfig */, + 9E8C1395E9F6F51C305D4152 /* Pods-Runner.release.xcconfig */, + 7B9D3CACBF0EBA46A469B3AD /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + 45C39602FFF8D511C02669EF /* Frameworks */ = { + isa = PBXGroup; + children = ( + EDA99BC2AB82371A95FD5323 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -78,8 +97,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - C31AF9DBD8FA92AB0A3F469D /* Pods */, - CCA6381FB3B15D4F1B518B80 /* Frameworks */, + 0613C8A5252A93C033B43D50 /* Pods */, + 45C39602FFF8D511C02669EF /* Frameworks */, ); sourceTree = ""; }; @@ -106,25 +125,6 @@ path = Runner; sourceTree = ""; }; - C31AF9DBD8FA92AB0A3F469D /* Pods */ = { - isa = PBXGroup; - children = ( - 009E4B54E92FB7C3805164F8 /* Pods-Runner.debug.xcconfig */, - 2647A05B96BF654A2BDA358C /* Pods-Runner.release.xcconfig */, - A90DE1550AC49F788008717B /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; - CCA6381FB3B15D4F1B518B80 /* Frameworks */ = { - isa = PBXGroup; - children = ( - CEC754D59E082997D6D9D179 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -132,7 +132,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 470B8D23B3C990D143B39755 /* [CP] Check Pods Manifest.lock */, + B68A5A4B07195593A0564512 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -211,7 +211,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 470B8D23B3C990D143B39755 /* [CP] Check Pods Manifest.lock */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + B68A5A4B07195593A0564512 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -233,20 +247,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/isolate_example/lib/data_transfer_page.dart b/isolate_example/lib/data_transfer_page.dart index 63116b813..3564469b8 100644 --- a/isolate_example/lib/data_transfer_page.dart +++ b/isolate_example/lib/data_transfer_page.dart @@ -46,7 +46,7 @@ class DataTransferPage extends StatelessWidget { padding: const EdgeInsets.all(8), child: Text( 'Number Generator Progress', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), ), LinearProgressIndicator( diff --git a/isolate_example/lib/infinite_process_page.dart b/isolate_example/lib/infinite_process_page.dart index 89426e53b..5824dfe7b 100644 --- a/isolate_example/lib/infinite_process_page.dart +++ b/isolate_example/lib/infinite_process_page.dart @@ -45,7 +45,7 @@ class InfiniteProcessPage extends StatelessWidget { padding: const EdgeInsets.all(16.0), child: Text( 'Summation Results', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), ), const Expanded( diff --git a/isolate_example/macos/Runner.xcodeproj/project.pbxproj b/isolate_example/macos/Runner.xcodeproj/project.pbxproj index 3f102d8cf..95f75e355 100644 --- a/isolate_example/macos/Runner.xcodeproj/project.pbxproj +++ b/isolate_example/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 92F2985621484E44375DCD0B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44DE86D58AEF6E66C370A501 /* Pods_Runner.framework */; }; + D054C4456AC002524D901653 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE37C73142E48B01AEF9FA72 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,6 +53,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0C0C64BCA8B5D0F0584798F8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* isolate_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = isolate_example.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -67,12 +68,11 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 343C478F431E6768565EE8F9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 44DE86D58AEF6E66C370A501 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6B189514E66497B47658B142 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 8648B1BC2BEFC8F747300DD7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - B7E61A7AE4B5748C84EB03BB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + E75627659E56C0883773050B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + EE37C73142E48B01AEF9FA72 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 92F2985621484E44375DCD0B /* Pods_Runner.framework in Frameworks */, + D054C4456AC002524D901653 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - D5BE3BC49CE7762446CDD11C /* Pods */, + 6CDA68428E4468DEAFFA309D /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - D5BE3BC49CE7762446CDD11C /* Pods */ = { + 6CDA68428E4468DEAFFA309D /* Pods */ = { isa = PBXGroup; children = ( - 8648B1BC2BEFC8F747300DD7 /* Pods-Runner.debug.xcconfig */, - B7E61A7AE4B5748C84EB03BB /* Pods-Runner.release.xcconfig */, - 343C478F431E6768565EE8F9 /* Pods-Runner.profile.xcconfig */, + 6B189514E66497B47658B142 /* Pods-Runner.debug.xcconfig */, + 0C0C64BCA8B5D0F0584798F8 /* Pods-Runner.release.xcconfig */, + E75627659E56C0883773050B /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 44DE86D58AEF6E66C370A501 /* Pods_Runner.framework */, + EE37C73142E48B01AEF9FA72 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 2CD17591866594E8BC32C992 /* [CP] Check Pods Manifest.lock */, + 3DF6D78EEB19B36EAA03F1C9 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 9FAA1C3FE5E8DAB20740CD2E /* [CP] Embed Pods Frameworks */, + F245889618B0AAAB1BBF419E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,28 +254,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2CD17591866594E8BC32C992 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -313,7 +291,29 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 9FAA1C3FE5E8DAB20740CD2E /* [CP] Embed Pods Frameworks */ = { + 3DF6D78EEB19B36EAA03F1C9 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + F245889618B0AAAB1BBF419E /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/jsonexample/.metadata b/jsonexample/.metadata index 39f2501e1..31b763f97 100644 --- a/jsonexample/.metadata +++ b/jsonexample/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/jsonexample/android/gradle/wrapper/gradle-wrapper.properties b/jsonexample/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/jsonexample/android/gradle/wrapper/gradle-wrapper.properties +++ b/jsonexample/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/jsonexample/ios/Flutter/AppFrameworkInfo.plist b/jsonexample/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/jsonexample/ios/Flutter/AppFrameworkInfo.plist +++ b/jsonexample/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/jsonexample/ios/Podfile b/jsonexample/ios/Podfile index 1e8c3c90a..88359b225 100644 --- a/jsonexample/ios/Podfile +++ b/jsonexample/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/jsonexample/ios/Runner.xcodeproj/project.pbxproj b/jsonexample/ios/Runner.xcodeproj/project.pbxproj index f7a5517f9..9ea6c11f6 100644 --- a/jsonexample/ios/Runner.xcodeproj/project.pbxproj +++ b/jsonexample/ios/Runner.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2237E99645D5798763DD54B6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6CBDB685DA53A17B91338F2 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 437DE8C4DE9B6079F564147A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCA8F1A8F41846E13AC3F12C /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -33,7 +33,8 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 4791330AB22F9163853DAEA5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 51FA1619E3F8027D449FF99D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 5849AA6BD2F17264903F2230 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -44,9 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9BB36C47F9C953464DB55182 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - BAC423DA83E723B80A4CD4CE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - E6CBDB685DA53A17B91338F2 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AEF18767E2FCF3004C46260B /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + CCA8F1A8F41846E13AC3F12C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,17 +54,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2237E99645D5798763DD54B6 /* Pods_Runner.framework in Frameworks */, + 437DE8C4DE9B6079F564147A /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5B428D163FD42AB47FB0204C /* Frameworks */ = { + 11410BCF91B6BEAB7DFA888D /* Frameworks */ = { isa = PBXGroup; children = ( - E6CBDB685DA53A17B91338F2 /* Pods_Runner.framework */, + CCA8F1A8F41846E13AC3F12C /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -86,8 +86,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - C35D6FB79004D2DE2852C508 /* Pods */, - 5B428D163FD42AB47FB0204C /* Frameworks */, + BFE6723843BDFB59CB8E67D2 /* Pods */, + 11410BCF91B6BEAB7DFA888D /* Frameworks */, ); sourceTree = ""; }; @@ -114,12 +114,12 @@ path = Runner; sourceTree = ""; }; - C35D6FB79004D2DE2852C508 /* Pods */ = { + BFE6723843BDFB59CB8E67D2 /* Pods */ = { isa = PBXGroup; children = ( - 4791330AB22F9163853DAEA5 /* Pods-Runner.debug.xcconfig */, - 9BB36C47F9C953464DB55182 /* Pods-Runner.release.xcconfig */, - BAC423DA83E723B80A4CD4CE /* Pods-Runner.profile.xcconfig */, + AEF18767E2FCF3004C46260B /* Pods-Runner.debug.xcconfig */, + 51FA1619E3F8027D449FF99D /* Pods-Runner.release.xcconfig */, + 5849AA6BD2F17264903F2230 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -132,7 +132,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9DB25BDC7CEF632A767D7A07 /* [CP] Check Pods Manifest.lock */, + AE4C7C9D8863A33D792888CA /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -225,7 +225,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9DB25BDC7CEF632A767D7A07 /* [CP] Check Pods Manifest.lock */ = { + AE4C7C9D8863A33D792888CA /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -399,7 +399,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -448,7 +448,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/jsonexample/ios/Runner/Info.plist b/jsonexample/ios/Runner/Info.plist index 465f3f5c0..5de922330 100644 --- a/jsonexample/ios/Runner/Info.plist +++ b/jsonexample/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/jsonexample/lib/tab_pages.dart b/jsonexample/lib/tab_pages.dart index 379957930..fc592bc03 100644 --- a/jsonexample/lib/tab_pages.dart +++ b/jsonexample/lib/tab_pages.dart @@ -41,7 +41,7 @@ class BasicsPage extends StatelessWidget { Widget build(BuildContext context) { final localTheme = Theme.of(context).textTheme; final boldStyle = - localTheme.bodyText2!.copyWith(fontWeight: FontWeight.w600); + localTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600); final dynamicListOfInts = json.decode(JsonStrings.listOfInts) as List; final strongListOfInts = List.from(dynamicListOfInts); @@ -76,7 +76,7 @@ class BasicsPage extends StatelessWidget { ), Text( prettyPrintList(strongListOfInts), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -88,7 +88,7 @@ class BasicsPage extends StatelessWidget { ), Text( prettyPrintList(strongListOfStrings), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -100,7 +100,7 @@ class BasicsPage extends StatelessWidget { ), Text( prettyPrintList(strongListOfDoubles), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -112,7 +112,7 @@ class BasicsPage extends StatelessWidget { ), Text( prettyPrintList(strongListOfDynamics), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -136,7 +136,7 @@ class BasicsPage extends StatelessWidget { }, children: createMapRows( strongMapOfDynamics, - localTheme.bodyText2!, + localTheme.bodyMedium!, boldStyle, ), ), diff --git a/jsonexample/lib/widgets.dart b/jsonexample/lib/widgets.dart index a534cbad5..9879032f3 100644 --- a/jsonexample/lib/widgets.dart +++ b/jsonexample/lib/widgets.dart @@ -14,9 +14,9 @@ class SimpleObjectView extends StatelessWidget { Widget build(BuildContext context) { final localTheme = Theme.of(context).textTheme; final boldStyle = - localTheme.bodyText2!.copyWith(fontWeight: FontWeight.w600); + localTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600); - if (simpleObject == null) return Text('NULL', style: localTheme.bodyText2); + if (simpleObject == null) return Text('NULL', style: localTheme.bodyMedium); return Table( columnWidths: const { @@ -34,7 +34,7 @@ class SimpleObjectView extends StatelessWidget { simpleObject.aString != null ? '"${simpleObject.aString}"' : 'NULL', - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -43,7 +43,7 @@ class SimpleObjectView extends StatelessWidget { Text('anInt:', style: boldStyle), Text( simpleObject.anInt?.toString() ?? 'NULL', - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -51,7 +51,7 @@ class SimpleObjectView extends StatelessWidget { Text('aDouble:', style: boldStyle), Text( simpleObject.aDouble?.toString() ?? 'NULL', - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ]), TableRow( @@ -61,7 +61,7 @@ class SimpleObjectView extends StatelessWidget { prettyPrintList( simpleObject.aListOfStrings as Iterable?, ), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -70,7 +70,7 @@ class SimpleObjectView extends StatelessWidget { Text('aListOfInts:', style: boldStyle), Text( prettyPrintList(simpleObject.aListOfInts as Iterable?), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -83,7 +83,7 @@ class SimpleObjectView extends StatelessWidget { Text( prettyPrintList( simpleObject.aListOfDoubles as Iterable?), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -105,7 +105,7 @@ class SimpleObjectViewList extends StatelessWidget { widgets.addAll([ Text( 'SimpleObject $i:', - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), const SizedBox(height: 4.0), SimpleObjectView(simpleObject: simpleObjects[i]), @@ -159,7 +159,7 @@ class ComplexObjectView extends StatelessWidget { Widget build(BuildContext context) { final localTheme = Theme.of(context).textTheme; final boldStyle = - localTheme.bodyText2!.copyWith(fontWeight: FontWeight.w600); + localTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600); return Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -177,21 +177,21 @@ class ComplexObjectView extends StatelessWidget { complexObject.aString != null ? '"${complexObject.aString}"' : 'NULL', - style: localTheme.bodyText2), + style: localTheme.bodyMedium), ], ), TableRow( children: [ Text('anInt:', style: boldStyle), Text(complexObject.anInt?.toString() ?? 'NULL', - style: localTheme.bodyText2), + style: localTheme.bodyMedium), ], ), TableRow( children: [ Text('aDouble:', style: boldStyle), Text(complexObject.aDouble?.toString() ?? 'NULL', - style: localTheme.bodyText2), + style: localTheme.bodyMedium), ], ), TableRow( @@ -218,7 +218,7 @@ class ComplexObjectView extends StatelessWidget { Text( prettyPrintList( complexObject.aListOfStrings as Iterable?), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -228,7 +228,7 @@ class ComplexObjectView extends StatelessWidget { Text( prettyPrintList( complexObject.aListOfInts as Iterable?), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -241,7 +241,7 @@ class ComplexObjectView extends StatelessWidget { Text( prettyPrintList( complexObject.aListOfDoubles as Iterable?), - style: localTheme.bodyText2, + style: localTheme.bodyMedium, ), ], ), @@ -279,7 +279,7 @@ class ComplexObjectViewList extends StatelessWidget { widgets.addAll([ Text( 'Complex Object $i:', - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), const SizedBox(height: 4.0), ComplexObjectView(complexObject: complexObjects[i]), diff --git a/jsonexample/macos/Runner.xcodeproj/project.pbxproj b/jsonexample/macos/Runner.xcodeproj/project.pbxproj index a7abe66c1..aa272c66a 100644 --- a/jsonexample/macos/Runner.xcodeproj/project.pbxproj +++ b/jsonexample/macos/Runner.xcodeproj/project.pbxproj @@ -21,12 +21,12 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 0C05B1112FB5B5249A401EF2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5FF50AF6C506E5874DE5CFB /* Pods_Runner.framework */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 9E1DF564C6F0C5270B082BAF /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26CF5D4F94952D7C080C386A /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,7 +53,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 25C83C7375DAB3B5D5719B3A /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 26CF5D4F94952D7C080C386A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* jsonexample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = jsonexample.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -68,11 +68,11 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 42781563EB21C5079954A828 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 961A6C2B83509F4666CFE501 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - D5FF50AF6C506E5874DE5CFB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DDE07ED37DFFF56981053D11 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D33C6A8458290B971C1D199D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + F6C96B4218737B4BD3D9B388 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0C05B1112FB5B5249A401EF2 /* Pods_Runner.framework in Frameworks */, + 9E1DF564C6F0C5270B082BAF /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 8BE9A2D20ED4580E9E9B4059 /* Pods */, + 4585CB5EFC238F7A284A9F6B /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - 8BE9A2D20ED4580E9E9B4059 /* Pods */ = { + 4585CB5EFC238F7A284A9F6B /* Pods */ = { isa = PBXGroup; children = ( - 42781563EB21C5079954A828 /* Pods-Runner.debug.xcconfig */, - DDE07ED37DFFF56981053D11 /* Pods-Runner.release.xcconfig */, - 25C83C7375DAB3B5D5719B3A /* Pods-Runner.profile.xcconfig */, + 961A6C2B83509F4666CFE501 /* Pods-Runner.debug.xcconfig */, + F6C96B4218737B4BD3D9B388 /* Pods-Runner.release.xcconfig */, + D33C6A8458290B971C1D199D /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D5FF50AF6C506E5874DE5CFB /* Pods_Runner.framework */, + 26CF5D4F94952D7C080C386A /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9BCF822D625182497511DDE1 /* [CP] Check Pods Manifest.lock */, + 175877957BDAF3DC51B1CD05 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 4733662F012B341D76318920 /* [CP] Embed Pods Frameworks */, + 36ABC32FCFFF2EA0F12932F2 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,6 +254,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 175877957BDAF3DC51B1CD05 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -291,7 +313,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 4733662F012B341D76318920 /* [CP] Embed Pods Frameworks */ = { + 36ABC32FCFFF2EA0F12932F2 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -308,28 +330,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 9BCF822D625182497511DDE1 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/jsonexample/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/jsonexample/windows/runner/CMakeLists.txt b/jsonexample/windows/runner/CMakeLists.txt index b9e550fba..17411a8ab 100644 --- a/jsonexample/windows/runner/CMakeLists.txt +++ b/jsonexample/windows/runner/CMakeLists.txt @@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") diff --git a/jsonexample/windows/runner/Runner.rc b/jsonexample/windows/runner/Runner.rc index 05003c19b..9ba2fa75f 100644 --- a/jsonexample/windows/runner/Runner.rc +++ b/jsonexample/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/jsonexample/windows/runner/runner.exe.manifest b/jsonexample/windows/runner/runner.exe.manifest index c977c4a42..a42ea7687 100644 --- a/jsonexample/windows/runner/runner.exe.manifest +++ b/jsonexample/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/navigation_and_routing/.metadata b/navigation_and_routing/.metadata index 39f2501e1..31b763f97 100644 --- a/navigation_and_routing/.metadata +++ b/navigation_and_routing/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties b/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties +++ b/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/navigation_and_routing/ios/Flutter/AppFrameworkInfo.plist b/navigation_and_routing/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/navigation_and_routing/ios/Flutter/AppFrameworkInfo.plist +++ b/navigation_and_routing/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/navigation_and_routing/ios/Podfile b/navigation_and_routing/ios/Podfile index 1e8c3c90a..88359b225 100644 --- a/navigation_and_routing/ios/Podfile +++ b/navigation_and_routing/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj b/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj index ef1fb2cf5..61215d506 100644 --- a/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj +++ b/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -349,7 +349,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -398,7 +398,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/navigation_and_routing/ios/Runner/Info.plist b/navigation_and_routing/ios/Runner/Info.plist index c6c85cda0..bb4b46d20 100644 --- a/navigation_and_routing/ios/Runner/Info.plist +++ b/navigation_and_routing/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/navigation_and_routing/lib/src/screens/book_details.dart b/navigation_and_routing/lib/src/screens/book_details.dart index ed368a0ea..72a934686 100644 --- a/navigation_and_routing/lib/src/screens/book_details.dart +++ b/navigation_and_routing/lib/src/screens/book_details.dart @@ -34,11 +34,11 @@ class BookDetailsScreen extends StatelessWidget { children: [ Text( book!.title, - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), Text( book!.author.name, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), TextButton( child: const Text('View author (Push)'), diff --git a/navigation_and_routing/lib/src/screens/settings.dart b/navigation_and_routing/lib/src/screens/settings.dart index ff0d41a97..d25ec1ba2 100644 --- a/navigation_and_routing/lib/src/screens/settings.dart +++ b/navigation_and_routing/lib/src/screens/settings.dart @@ -48,7 +48,7 @@ class SettingsContent extends StatelessWidget { ...[ Text( 'Settings', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), ElevatedButton( onPressed: () { diff --git a/navigation_and_routing/lib/src/screens/sign_in.dart b/navigation_and_routing/lib/src/screens/sign_in.dart index 7131cdf3c..84f915f73 100644 --- a/navigation_and_routing/lib/src/screens/sign_in.dart +++ b/navigation_and_routing/lib/src/screens/sign_in.dart @@ -38,7 +38,8 @@ class _SignInScreenState extends State { mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ - Text('Sign in', style: Theme.of(context).textTheme.headline4), + Text('Sign in', + style: Theme.of(context).textTheme.headlineMedium), TextField( decoration: const InputDecoration(labelText: 'Username'), controller: _usernameController, diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/navigation_and_routing/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/navigation_and_routing/windows/runner/CMakeLists.txt b/navigation_and_routing/windows/runner/CMakeLists.txt index b9e550fba..17411a8ab 100644 --- a/navigation_and_routing/windows/runner/CMakeLists.txt +++ b/navigation_and_routing/windows/runner/CMakeLists.txt @@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") diff --git a/navigation_and_routing/windows/runner/Runner.rc b/navigation_and_routing/windows/runner/Runner.rc index 64d3b5a17..0434c99e3 100644 --- a/navigation_and_routing/windows/runner/Runner.rc +++ b/navigation_and_routing/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/navigation_and_routing/windows/runner/runner.exe.manifest b/navigation_and_routing/windows/runner/runner.exe.manifest index c977c4a42..a42ea7687 100644 --- a/navigation_and_routing/windows/runner/runner.exe.manifest +++ b/navigation_and_routing/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/null_safety/null_safe_app/.metadata b/null_safety/null_safe_app/.metadata index 39f2501e1..31b763f97 100644 --- a/null_safety/null_safe_app/.metadata +++ b/null_safety/null_safe_app/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties b/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist b/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist +++ b/null_safety/null_safe_app/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/null_safety/null_safe_app/ios/Podfile b/null_safety/null_safe_app/ios/Podfile index 1e8c3c90a..88359b225 100644 --- a/null_safety/null_safe_app/ios/Podfile +++ b/null_safety/null_safe_app/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj b/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj index aa5b84a69..1448b8851 100644 --- a/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj +++ b/null_safety/null_safe_app/ios/Runner.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - DC8C38B1C4D98EBD8C83CC0B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E0B7271FFA3C206889A6D2C /* Pods_Runner.framework */; }; + BF62D040289FF8F4805B602C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14E1487E88BC921250912C09 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,14 +32,14 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 14E1487E88BC921250912C09 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2010AAE4CBBE00CB839BFF7C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 328A1AA89AFDDF5149206AB6 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 34D0A5D8E8CE1E43EB4169D7 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 6E0B7271FFA3C206889A6D2C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7744B1BD2FECB151CA0C6EE8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7E7E65638320E735562F53DD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 8658E7A1C77B0A7326FA35AE /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -54,13 +54,32 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DC8C38B1C4D98EBD8C83CC0B /* Pods_Runner.framework in Frameworks */, + BF62D040289FF8F4805B602C /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 306A4EA63E49E9D3B01CBAAB /* Frameworks */ = { + isa = PBXGroup; + children = ( + 14E1487E88BC921250912C09 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 411BA2AC00C770969A3758B7 /* Pods */ = { + isa = PBXGroup; + children = ( + 328A1AA89AFDDF5149206AB6 /* Pods-Runner.debug.xcconfig */, + 2010AAE4CBBE00CB839BFF7C /* Pods-Runner.release.xcconfig */, + 34D0A5D8E8CE1E43EB4169D7 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -78,8 +97,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - EF36F27D2A22665F8AC8CDAA /* Pods */, - C763615FCB920B2E33307058 /* Frameworks */, + 411BA2AC00C770969A3758B7 /* Pods */, + 306A4EA63E49E9D3B01CBAAB /* Frameworks */, ); sourceTree = ""; }; @@ -106,25 +125,6 @@ path = Runner; sourceTree = ""; }; - C763615FCB920B2E33307058 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 6E0B7271FFA3C206889A6D2C /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - EF36F27D2A22665F8AC8CDAA /* Pods */ = { - isa = PBXGroup; - children = ( - 8658E7A1C77B0A7326FA35AE /* Pods-Runner.debug.xcconfig */, - 7744B1BD2FECB151CA0C6EE8 /* Pods-Runner.release.xcconfig */, - 7E7E65638320E735562F53DD /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -132,7 +132,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - F3B22ACB788F038ADBF53DEB /* [CP] Check Pods Manifest.lock */, + E479CBF8D6BDD38CA28B75D2 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -225,7 +225,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - F3B22ACB788F038ADBF53DEB /* [CP] Check Pods Manifest.lock */ = { + E479CBF8D6BDD38CA28B75D2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -399,7 +399,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -448,7 +448,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/null_safety/null_safe_app/ios/Runner/Info.plist b/null_safety/null_safe_app/ios/Runner/Info.plist index f29b59fc5..0ad89e590 100644 --- a/null_safety/null_safe_app/ios/Runner/Info.plist +++ b/null_safety/null_safe_app/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/null_safety/null_safe_app/macos/Runner.xcodeproj/project.pbxproj b/null_safety/null_safe_app/macos/Runner.xcodeproj/project.pbxproj index f977fb287..dd0249654 100644 --- a/null_safety/null_safe_app/macos/Runner.xcodeproj/project.pbxproj +++ b/null_safety/null_safe_app/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 45FF10BF47C242CD1316D08F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B62325549973F97B4737E45 /* Pods_Runner.framework */; }; + BC703845EB92F6BCCB85AC1C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD6E90389816BF4667B487FE /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,7 +53,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2B62325549973F97B4737E45 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2FA0EA6DF083DBAFFC9F00E9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* null_safe_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = null_safe_app.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -68,11 +68,11 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 4F97956F30A5BE807AAEDD7A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 53D97972DF621C46FF67433D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 903925681958365AE20E64CF /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - BB01090C238D66666CCDFDEA /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - C9D633544799E35CA1551193 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + BD6E90389816BF4667B487FE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,24 +80,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 45FF10BF47C242CD1316D08F /* Pods_Runner.framework in Frameworks */, + BC703845EB92F6BCCB85AC1C /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 034DFDE5955545E4CE0A166C /* Pods */ = { - isa = PBXGroup; - children = ( - C9D633544799E35CA1551193 /* Pods-Runner.debug.xcconfig */, - BB01090C238D66666CCDFDEA /* Pods-Runner.release.xcconfig */, - 903925681958365AE20E64CF /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 33BA886A226E78AF003329D5 /* Configs */ = { isa = PBXGroup; children = ( @@ -116,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 034DFDE5955545E4CE0A166C /* Pods */, + 3DC9FDBB254F00F6DC041ECE /* Pods */, ); sourceTree = ""; }; @@ -163,10 +152,21 @@ path = Runner; sourceTree = ""; }; + 3DC9FDBB254F00F6DC041ECE /* Pods */ = { + isa = PBXGroup; + children = ( + 2FA0EA6DF083DBAFFC9F00E9 /* Pods-Runner.debug.xcconfig */, + 4F97956F30A5BE807AAEDD7A /* Pods-Runner.release.xcconfig */, + 53D97972DF621C46FF67433D /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 2B62325549973F97B4737E45 /* Pods_Runner.framework */, + BD6E90389816BF4667B487FE /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 1E764FEE9AA7656B16195D57 /* [CP] Check Pods Manifest.lock */, + 0EB7766DF171C206476D8621 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - E8221DDC397CBB6B976E517D /* [CP] Embed Pods Frameworks */, + 09DE7C720E796C4336BF5CB4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,7 +254,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1E764FEE9AA7656B16195D57 /* [CP] Check Pods Manifest.lock */ = { + 09DE7C720E796C4336BF5CB4 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 0EB7766DF171C206476D8621 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -313,23 +330,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - E8221DDC397CBB6B976E517D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/null_safety/null_safe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/null_safety/null_safe_app/windows/runner/CMakeLists.txt b/null_safety/null_safe_app/windows/runner/CMakeLists.txt index b9e550fba..17411a8ab 100644 --- a/null_safety/null_safe_app/windows/runner/CMakeLists.txt +++ b/null_safety/null_safe_app/windows/runner/CMakeLists.txt @@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") diff --git a/null_safety/null_safe_app/windows/runner/Runner.rc b/null_safety/null_safe_app/windows/runner/Runner.rc index 7ad32828e..19015b18c 100644 --- a/null_safety/null_safe_app/windows/runner/Runner.rc +++ b/null_safety/null_safe_app/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/null_safety/null_safe_app/windows/runner/runner.exe.manifest b/null_safety/null_safe_app/windows/runner/runner.exe.manifest index c977c4a42..a42ea7687 100644 --- a/null_safety/null_safe_app/windows/runner/runner.exe.manifest +++ b/null_safety/null_safe_app/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/null_safety/null_unsafe_app/.metadata b/null_safety/null_unsafe_app/.metadata index 39f2501e1..31b763f97 100644 --- a/null_safety/null_unsafe_app/.metadata +++ b/null_safety/null_unsafe_app/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties b/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist b/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist +++ b/null_safety/null_unsafe_app/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/null_safety/null_unsafe_app/ios/Podfile b/null_safety/null_unsafe_app/ios/Podfile index 1e8c3c90a..88359b225 100644 --- a/null_safety/null_unsafe_app/ios/Podfile +++ b/null_safety/null_unsafe_app/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj index 977078cc1..981d5d0db 100644 --- a/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj +++ b/null_safety/null_unsafe_app/ios/Runner.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 96D704B550FA57F1CDD5B476 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B798A50AAA77155C68BCBBE9 /* Pods_Runner.framework */; }; + 8748D946026204182E6B40D0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FFEE57B373485B4E5061F1D /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -32,11 +32,12 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 19542AD8EC6091CE1B88B2E3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 225928EB6BEF9C71BAA174AC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7D2BD6112A0848868742BAE5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -44,9 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B798A50AAA77155C68BCBBE9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DA5915B245F329A29489AE8C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - F9AE88CECE64B03C3856EC10 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 9FFEE57B373485B4E5061F1D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D7F95606AB9D77667850CC96 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,27 +54,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 96D704B550FA57F1CDD5B476 /* Pods_Runner.framework in Frameworks */, + 8748D946026204182E6B40D0 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3C82A8049E8193B4BD26E54F /* Frameworks */ = { + 13317245121AEC564850999A /* Frameworks */ = { isa = PBXGroup; children = ( - B798A50AAA77155C68BCBBE9 /* Pods_Runner.framework */, + 9FFEE57B373485B4E5061F1D /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; }; - 6A6C59D2CC6FF33D5439C70A /* Pods */ = { + 153F4A5B2684EF7375FE2B98 /* Pods */ = { isa = PBXGroup; children = ( - 19542AD8EC6091CE1B88B2E3 /* Pods-Runner.debug.xcconfig */, - F9AE88CECE64B03C3856EC10 /* Pods-Runner.release.xcconfig */, - DA5915B245F329A29489AE8C /* Pods-Runner.profile.xcconfig */, + 7D2BD6112A0848868742BAE5 /* Pods-Runner.debug.xcconfig */, + D7F95606AB9D77667850CC96 /* Pods-Runner.release.xcconfig */, + 225928EB6BEF9C71BAA174AC /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -97,8 +97,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 6A6C59D2CC6FF33D5439C70A /* Pods */, - 3C82A8049E8193B4BD26E54F /* Frameworks */, + 153F4A5B2684EF7375FE2B98 /* Pods */, + 13317245121AEC564850999A /* Frameworks */, ); sourceTree = ""; }; @@ -132,7 +132,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 90BF17B1750F759957AC0BF5 /* [CP] Check Pods Manifest.lock */, + AFA824A7938C6B95337017B3 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -211,7 +211,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 90BF17B1750F759957AC0BF5 /* [CP] Check Pods Manifest.lock */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + AFA824A7938C6B95337017B3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -233,20 +247,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -322,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -399,7 +399,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -448,7 +448,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/null_safety/null_unsafe_app/ios/Runner/Info.plist b/null_safety/null_unsafe_app/ios/Runner/Info.plist index 8c6191caf..4c5babf2b 100644 --- a/null_safety/null_unsafe_app/ios/Runner/Info.plist +++ b/null_safety/null_unsafe_app/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/null_safety/null_unsafe_app/macos/Runner.xcodeproj/project.pbxproj b/null_safety/null_unsafe_app/macos/Runner.xcodeproj/project.pbxproj index 0e033f175..7861e3454 100644 --- a/null_safety/null_unsafe_app/macos/Runner.xcodeproj/project.pbxproj +++ b/null_safety/null_unsafe_app/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - BFFBFC2DEAAB361ED8F391D0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8F618AE2AEB20EA5169D196 /* Pods_Runner.framework */; }; + 4B1E472DB008003D5636C564 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4354B5A5B5862CED4822998 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,7 +53,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0EAFBB1A24E9D69AA2814977 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 1B9537408EB3FEE4B0AEE516 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* null_unsafe_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = null_unsafe_app.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -68,11 +68,11 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 4C200DA6354B85E6F034C83B /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 4D33662F95D9D5C943531E82 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - 98EF6D30ABDEE64469603DEC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - B8F618AE2AEB20EA5169D196 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A932BE5D41BE215305E5B0C9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + E4354B5A5B5862CED4822998 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BFFBFC2DEAAB361ED8F391D0 /* Pods_Runner.framework in Frameworks */, + 4B1E472DB008003D5636C564 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 8E952426A2EB3FA570560CF9 /* Pods */, + D3DAC40E379FD525084BC6E1 /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - 8E952426A2EB3FA570560CF9 /* Pods */ = { + D3DAC40E379FD525084BC6E1 /* Pods */ = { isa = PBXGroup; children = ( - 0EAFBB1A24E9D69AA2814977 /* Pods-Runner.debug.xcconfig */, - 4C200DA6354B85E6F034C83B /* Pods-Runner.release.xcconfig */, - 98EF6D30ABDEE64469603DEC /* Pods-Runner.profile.xcconfig */, + 1B9537408EB3FEE4B0AEE516 /* Pods-Runner.debug.xcconfig */, + 4D33662F95D9D5C943531E82 /* Pods-Runner.release.xcconfig */, + A932BE5D41BE215305E5B0C9 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - B8F618AE2AEB20EA5169D196 /* Pods_Runner.framework */, + E4354B5A5B5862CED4822998 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 0538C44C5A0A9ACEABBC3FFA /* [CP] Check Pods Manifest.lock */, + 3E7306E97AD5FDE77D3B4A9A /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6949DF43C5FBB8CA05008E18 /* [CP] Embed Pods Frameworks */, + B33DE5D9CCBBF38C7EB97138 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,28 +254,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0538C44C5A0A9ACEABBC3FFA /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -313,7 +291,29 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 6949DF43C5FBB8CA05008E18 /* [CP] Embed Pods Frameworks */ = { + 3E7306E97AD5FDE77D3B4A9A /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + B33DE5D9CCBBF38C7EB97138 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/null_safety/null_unsafe_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/null_safety/null_unsafe_app/windows/runner/CMakeLists.txt b/null_safety/null_unsafe_app/windows/runner/CMakeLists.txt index b9e550fba..17411a8ab 100644 --- a/null_safety/null_unsafe_app/windows/runner/CMakeLists.txt +++ b/null_safety/null_unsafe_app/windows/runner/CMakeLists.txt @@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") diff --git a/null_safety/null_unsafe_app/windows/runner/Runner.rc b/null_safety/null_unsafe_app/windows/runner/Runner.rc index 58acc03ea..38eaaed1f 100644 --- a/null_safety/null_unsafe_app/windows/runner/Runner.rc +++ b/null_safety/null_unsafe_app/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/null_safety/null_unsafe_app/windows/runner/runner.exe.manifest b/null_safety/null_unsafe_app/windows/runner/runner.exe.manifest index c977c4a42..a42ea7687 100644 --- a/null_safety/null_unsafe_app/windows/runner/runner.exe.manifest +++ b/null_safety/null_unsafe_app/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/place_tracker/.metadata b/place_tracker/.metadata index dac7f1383..af040ba02 100644 --- a/place_tracker/.metadata +++ b/place_tracker/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - channel: beta + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + channel: stable project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/place_tracker/ios/Runner.xcodeproj/project.pbxproj b/place_tracker/ios/Runner.xcodeproj/project.pbxproj index c11acdd35..d83354220 100644 --- a/place_tracker/ios/Runner.xcodeproj/project.pbxproj +++ b/place_tracker/ios/Runner.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 1B0B687765671D02A60CBD14 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E233B6908465722B8E42EBC0 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -32,9 +31,7 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 32F58AF4436A5F6858EE000E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 5025D223B83FBBDB26ADB356 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -45,8 +42,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AC4619386FAF86FD7028A084 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E233B6908465722B8E42EBC0 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,21 +49,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1B0B687765671D02A60CBD14 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 036F98622E11B4F2B0BCF301 /* Frameworks */ = { - isa = PBXGroup; - children = ( - E233B6908465722B8E42EBC0 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -86,8 +72,6 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - A3DF4EB277490E0CD5D69E8B /* Pods */, - 036F98622E11B4F2B0BCF301 /* Frameworks */, ); sourceTree = ""; }; @@ -114,17 +98,6 @@ path = Runner; sourceTree = ""; }; - A3DF4EB277490E0CD5D69E8B /* Pods */ = { - isa = PBXGroup; - children = ( - 5025D223B83FBBDB26ADB356 /* Pods-Runner.debug.xcconfig */, - AC4619386FAF86FD7028A084 /* Pods-Runner.release.xcconfig */, - 32F58AF4436A5F6858EE000E /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -132,14 +105,12 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9DB85FE04FBD27C3AAF4FB01 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 16727DDEE57463EA4EBA04E5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -198,23 +169,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 16727DDEE57463EA4EBA04E5 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -243,28 +197,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9DB85FE04FBD27C3AAF4FB01 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/place_tracker/lib/place_list.dart b/place_tracker/lib/place_list.dart index 77df98010..6f0a32e78 100644 --- a/place_tracker/lib/place_list.dart +++ b/place_tracker/lib/place_list.dart @@ -196,7 +196,7 @@ class _PlaceListTile extends StatelessWidget { ), Text( place.description ?? '', - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, maxLines: 4, overflow: TextOverflow.ellipsis, ), diff --git a/platform_channels/.metadata b/platform_channels/.metadata index 86286ffa8..a7f9d6a7a 100644 --- a/platform_channels/.metadata +++ b/platform_channels/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - channel: beta + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + channel: stable project_type: app @@ -13,14 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/platform_channels/lib/src/event_channel_demo.dart b/platform_channels/lib/src/event_channel_demo.dart index 6164f87c0..0d164a900 100644 --- a/platform_channels/lib/src/event_channel_demo.dart +++ b/platform_channels/lib/src/event_channel_demo.dart @@ -18,7 +18,7 @@ class EventChannelDemo extends StatelessWidget { @override Widget build(BuildContext context) { - final textStyle = Theme.of(context).textTheme.headline5; + final textStyle = Theme.of(context).textTheme.headlineSmall; return Scaffold( appBar: AppBar( title: const Text('EventChannel Demo'), diff --git a/platform_channels/lib/src/method_channel_demo.dart b/platform_channels/lib/src/method_channel_demo.dart index 871d87abe..72708461f 100644 --- a/platform_channels/lib/src/method_channel_demo.dart +++ b/platform_channels/lib/src/method_channel_demo.dart @@ -30,7 +30,7 @@ class _MethodChannelDemoState extends State { children: [ Text( 'Value of count is $count', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox( height: 16, diff --git a/platform_design/.metadata b/platform_design/.metadata index 4c7eb5a58..af040ba02 100644 --- a/platform_design/.metadata +++ b/platform_design/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 channel: stable project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 + base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 # User provided section diff --git a/platform_design/android/gradle/wrapper/gradle-wrapper.properties b/platform_design/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..cb24abda1 100644 --- a/platform_design/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform_design/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/platform_design/ios/Flutter/AppFrameworkInfo.plist b/platform_design/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/platform_design/ios/Flutter/AppFrameworkInfo.plist +++ b/platform_design/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/platform_design/ios/Runner.xcodeproj/project.pbxproj b/platform_design/ios/Runner.xcodeproj/project.pbxproj index f326feab3..9fad160f2 100644 --- a/platform_design/ios/Runner.xcodeproj/project.pbxproj +++ b/platform_design/ios/Runner.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -349,7 +349,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -398,7 +398,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/platform_design/ios/Runner/Info.plist b/platform_design/ios/Runner/Info.plist index b483e1765..df00a5df8 100644 --- a/platform_design/ios/Runner/Info.plist +++ b/platform_design/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/platform_design/lib/widgets.dart b/platform_design/lib/widgets.dart index 6c593259e..21c0253e1 100644 --- a/platform_design/lib/widgets.dart +++ b/platform_design/lib/widgets.dart @@ -231,7 +231,7 @@ class SongPlaceholderTile extends StatelessWidget { child: Row( children: [ Container( - color: Theme.of(context).textTheme.bodyText2!.color, + color: Theme.of(context).textTheme.bodyMedium!.color, width: 130, ), const Padding( @@ -244,27 +244,27 @@ class SongPlaceholderTile extends StatelessWidget { Container( height: 9, margin: const EdgeInsets.only(right: 60), - color: Theme.of(context).textTheme.bodyText2!.color, + color: Theme.of(context).textTheme.bodyMedium!.color, ), Container( height: 9, margin: const EdgeInsets.only(right: 20, top: 8), - color: Theme.of(context).textTheme.bodyText2!.color, + color: Theme.of(context).textTheme.bodyMedium!.color, ), Container( height: 9, margin: const EdgeInsets.only(right: 40, top: 8), - color: Theme.of(context).textTheme.bodyText2!.color, + color: Theme.of(context).textTheme.bodyMedium!.color, ), Container( height: 9, margin: const EdgeInsets.only(right: 80, top: 8), - color: Theme.of(context).textTheme.bodyText2!.color, + color: Theme.of(context).textTheme.bodyMedium!.color, ), Container( height: 9, margin: const EdgeInsets.only(right: 50, top: 8), - color: Theme.of(context).textTheme.bodyText2!.color, + color: Theme.of(context).textTheme.bodyMedium!.color, ), ], ), diff --git a/platform_view_swift/lib/main.dart b/platform_view_swift/lib/main.dart index add62b313..74a5f154c 100644 --- a/platform_view_swift/lib/main.dart +++ b/platform_view_swift/lib/main.dart @@ -61,7 +61,7 @@ class _HomePageState extends State { children: [ Text( 'Button tapped $_counter time${_counter == 1 ? '' : 's'}.', - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), const SizedBox(height: 18), ElevatedButton( @@ -79,7 +79,7 @@ class _HomePageState extends State { const FlutterLogo(), Text( 'Flutter', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), ], ), diff --git a/provider_counter/lib/main.dart b/provider_counter/lib/main.dart index d02d4e37f..77d3414be 100644 --- a/provider_counter/lib/main.dart +++ b/provider_counter/lib/main.dart @@ -96,7 +96,7 @@ class MyHomePage extends StatelessWidget { Consumer( builder: (context, counter, child) => Text( '${counter.value}', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), ), ], diff --git a/provider_shopper/lib/common/theme.dart b/provider_shopper/lib/common/theme.dart index 34f10f83c..e02ba1f72 100644 --- a/provider_shopper/lib/common/theme.dart +++ b/provider_shopper/lib/common/theme.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; final appTheme = ThemeData( primarySwatch: Colors.yellow, textTheme: const TextTheme( - headline1: TextStyle( + displayLarge: TextStyle( fontFamily: 'Corben', fontWeight: FontWeight.w700, fontSize: 24, diff --git a/provider_shopper/lib/screens/cart.dart b/provider_shopper/lib/screens/cart.dart index a346b434c..467391113 100644 --- a/provider_shopper/lib/screens/cart.dart +++ b/provider_shopper/lib/screens/cart.dart @@ -13,7 +13,7 @@ class MyCart extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text('Cart', style: Theme.of(context).textTheme.headline1), + title: Text('Cart', style: Theme.of(context).textTheme.displayLarge), backgroundColor: Colors.white, ), body: Container( @@ -38,7 +38,7 @@ class MyCart extends StatelessWidget { class _CartList extends StatelessWidget { @override Widget build(BuildContext context) { - var itemNameStyle = Theme.of(context).textTheme.headline6; + var itemNameStyle = Theme.of(context).textTheme.titleLarge; // This gets the current state of CartModel and also tells Flutter // to rebuild this widget when CartModel notifies listeners (in other words, // when it changes). @@ -67,7 +67,7 @@ class _CartTotal extends StatelessWidget { @override Widget build(BuildContext context) { var hugeStyle = - Theme.of(context).textTheme.headline1!.copyWith(fontSize: 48); + Theme.of(context).textTheme.displayLarge!.copyWith(fontSize: 48); return SizedBox( height: 200, diff --git a/provider_shopper/lib/screens/catalog.dart b/provider_shopper/lib/screens/catalog.dart index 74cd7e848..85947f458 100644 --- a/provider_shopper/lib/screens/catalog.dart +++ b/provider_shopper/lib/screens/catalog.dart @@ -75,7 +75,7 @@ class _MyAppBar extends StatelessWidget { @override Widget build(BuildContext context) { return SliverAppBar( - title: Text('Catalog', style: Theme.of(context).textTheme.headline1), + title: Text('Catalog', style: Theme.of(context).textTheme.displayLarge), floating: true, actions: [ IconButton( @@ -99,7 +99,7 @@ class _MyListItem extends StatelessWidget { // about any other change. (catalog) => catalog.getByPosition(index), ); - var textTheme = Theme.of(context).textTheme.headline6; + var textTheme = Theme.of(context).textTheme.titleLarge; return Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), diff --git a/provider_shopper/lib/screens/login.dart b/provider_shopper/lib/screens/login.dart index 1aa7fcbe3..8fa851485 100644 --- a/provider_shopper/lib/screens/login.dart +++ b/provider_shopper/lib/screens/login.dart @@ -18,7 +18,7 @@ class MyLogin extends StatelessWidget { children: [ Text( 'Welcome', - style: Theme.of(context).textTheme.headline1, + style: Theme.of(context).textTheme.displayLarge, ), TextFormField( decoration: const InputDecoration( diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh index 7bb5c0e9f..a9dbc19d3 100755 --- a/tool/flutter_ci_script_master.sh +++ b/tool/flutter_ci_script_master.sh @@ -8,65 +8,40 @@ source "$DIR/flutter_ci_script_shared.sh" flutter doctor -v declare -ar PROJECT_NAMES=( - # TODO(domesticmouse): re-enable when stable increments - # "add_to_app/books/flutter_module_books" - # TODO(domesticmouse): headline5 deprecated - # "add_to_app/fullscreen/flutter_module" - # TODO(domesticmouse): headline4 is deprecated - # "add_to_app/multiple_flutters/multiple_flutters_module" - # TODO(domesticmouse): headline5 deprecated - # "add_to_app/plugin/flutter_module_using_plugin" - # TODO(domesticmouse): headline5 deprecated - # "add_to_app/prebuilt_module/flutter_module" - # TODO(domesticmouse): headline4 is deprecated - # "android_splash_screen" - # TODO(domesticmouse): headline4 is deprecated - # "animations" - # TODO(domesticmouse): re-enable when stable increments - # "desktop_photo_search/fluent_ui" - # TODO(domesticmouse): re-enable when stable increments - # "desktop_photo_search/material" - # TODO(domesticmouse): headline5 deprecated - # "experimental/federated_plugin/federated_plugin" - # TODO(domesticmouse): re-enable when stable increments - # "experimental/web_dashboard" - # Needs a reformat to work on master + "add_to_app/books/flutter_module_books" + "add_to_app/fullscreen/flutter_module" + "add_to_app/multiple_flutters/multiple_flutters_module" + "add_to_app/plugin/flutter_module_using_plugin" + "add_to_app/prebuilt_module/flutter_module" + "android_splash_screen" + "animations" + "desktop_photo_search/fluent_ui" + "desktop_photo_search/material" + "experimental/federated_plugin/federated_plugin" + "experimental/web_dashboard" + # TODO(domesticmouse): Needs a reformat to work on master # "experimental/linting_tool" "experimental/material_3_demo" "flutter_maps_firestore" - # TODO(domesticmouse): re-enable when stable increments - # "form_app" - # TODO(domesticmouse): bodyText2 is deprecated - # "game_template" - # TODO(domesticmouse): headline6 is deprecated - # "infinite_list" + "form_app" + "game_template" + "infinite_list" "ios_app_clip" - # TODO(domesticmouse): re-enable when stable increments - # "isolate_example" - # TODO(domesticmouse): bodyText2 is deprecated - # "jsonexample" - # TODO(domesticmouse): re-enable when stable increments - # "material_3_demo" - # TODO(domesticmouse): headline4 is deprecated - # "navigation_and_routing" + "isolate_example" + "jsonexample" + "material_3_demo" + "navigation_and_routing" "null_safety/null_safe_app" "null_safety/null_unsafe_app" - # TODO(domesticmouse): re-enable when stable increments - # "place_tracker" - # TODO(domesticmouse): re-enable when stable increments - # "platform_channels" - # TODO(domesticmouse): bodyText2 is deprecated - # "platform_design" - # TODO(domesticmouse): subtitle2 is deprecated - # "platform_view_swift" - # TODO(domesticmouse): headline4 is deprecated - # "provider_counter" - # TODO(domesticmouse): re-enable when stable increments - # "provider_shopper" - # TODO(domesticmouse): re-enable when stable increments + "place_tracker" + "platform_channels" + "platform_design" + "platform_view_swift" + "provider_counter" + "provider_shopper" + # TODO(domesticmouse): Missing concrete implementation of 'TextInputClient.performSelector' # "simplistic_editor" - # TODO(domesticmouse): re-enable when stable increments - # "testing_app" + "testing_app" "veggieseasons" )