diff --git a/add_to_app/books/flutter_module_books/lib/api.dart b/add_to_app/books/flutter_module_books/lib/api.dart index dfe839644a6..6076a41bc79 100644 --- a/add_to_app/books/flutter_module_books/lib/api.dart +++ b/add_to_app/books/flutter_module_books/lib/api.dart @@ -5,7 +5,6 @@ import 'dart:async'; import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List; -import 'package:flutter/foundation.dart' show WriteBuffer, ReadBuffer; import 'package:flutter/services.dart'; class Book { diff --git a/desktop_photo_search/fluent_ui/.metadata b/desktop_photo_search/fluent_ui/.metadata index d1551205dfc..a8fe59a1db2 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: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + channel: beta project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 # User provided section diff --git a/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart b/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart index dcb8398940a..aa792db2872 100644 --- a/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart +++ b/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:typed_data'; - import 'package:flutter/foundation.dart'; import '../unsplash/photo.dart'; diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7ca8..82b6f9d9a33 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc164216..13b35eba55c 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be613897..0a3f5fa40fb 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2f2..bdb57226d5f 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a6528647..f083318e09c 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a726136a..326c0e72c9d 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd3f..2f1632cfddf 100644 Binary files a/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/desktop_photo_search/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt b/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt index b9e550fba8e..17411a8ab8e 100644 --- a/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt +++ b/desktop_photo_search/fluent_ui/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/desktop_photo_search/fluent_ui/windows/runner/Runner.rc b/desktop_photo_search/fluent_ui/windows/runner/Runner.rc index 84c7217226a..b719e46f492 100644 --- a/desktop_photo_search/fluent_ui/windows/runner/Runner.rc +++ b/desktop_photo_search/fluent_ui/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/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest b/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest index c977c4a4258..a42ea7687cb 100644 --- a/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest +++ b/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/desktop_photo_search/material/.metadata b/desktop_photo_search/material/.metadata index d1551205dfc..a8fe59a1db2 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: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + channel: beta project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 # User provided section diff --git a/desktop_photo_search/material/lib/src/model/photo_search_model.dart b/desktop_photo_search/material/lib/src/model/photo_search_model.dart index dcb8398940a..aa792db2872 100644 --- a/desktop_photo_search/material/lib/src/model/photo_search_model.dart +++ b/desktop_photo_search/material/lib/src/model/photo_search_model.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:typed_data'; - import 'package:flutter/foundation.dart'; import '../unsplash/photo.dart'; diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7ca8..82b6f9d9a33 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc164216..13b35eba55c 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be613897..0a3f5fa40fb 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2f2..bdb57226d5f 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a6528647..f083318e09c 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a726136a..326c0e72c9d 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd3f..2f1632cfddf 100644 Binary files a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/desktop_photo_search/material/windows/runner/CMakeLists.txt b/desktop_photo_search/material/windows/runner/CMakeLists.txt index b9e550fba8e..17411a8ab8e 100644 --- a/desktop_photo_search/material/windows/runner/CMakeLists.txt +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/Runner.rc b/desktop_photo_search/material/windows/runner/Runner.rc index 84c7217226a..b719e46f492 100644 --- a/desktop_photo_search/material/windows/runner/Runner.rc +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/runner.exe.manifest b/desktop_photo_search/material/windows/runner/runner.exe.manifest index c977c4a4258..a42ea7687cb 100644 --- a/desktop_photo_search/material/windows/runner/runner.exe.manifest +++ b/desktop_photo_search/material/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/experimental/web_dashboard/lib/src/pages/home.dart b/experimental/web_dashboard/lib/src/pages/home.dart index 8a895fbb415..a64902df749 100644 --- a/experimental/web_dashboard/lib/src/pages/home.dart +++ b/experimental/web_dashboard/lib/src/pages/home.dart @@ -34,10 +34,7 @@ class _HomePageState extends State { Padding( padding: const EdgeInsets.all(8.0), child: TextButton( - style: TextButton.styleFrom( - // ignore: deprecated_member_use - primary: Colors.white, - ), + style: TextButton.styleFrom(foregroundColor: Colors.white), onPressed: () => _handleSignOut(), child: const Text('Sign Out'), ), diff --git a/form_app/.metadata b/form_app/.metadata index 39f2501e1fa..ae91d3a9b42 100644 --- a/form_app/.metadata +++ b/form_app/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + channel: beta project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 # User provided section diff --git a/form_app/android/gradle/wrapper/gradle-wrapper.properties b/form_app/android/gradle/wrapper/gradle-wrapper.properties index cc5527d781a..cb24abda10a 100644 --- a/form_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/form_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/form_app/ios/Flutter/AppFrameworkInfo.plist b/form_app/ios/Flutter/AppFrameworkInfo.plist index 8d4492f977a..9625e105df3 100644 --- a/form_app/ios/Flutter/AppFrameworkInfo.plist +++ b/form_app/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/form_app/ios/Podfile b/form_app/ios/Podfile index 1e8c3c90a55..88359b225fa 100644 --- a/form_app/ios/Podfile +++ b/form_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/form_app/ios/Runner.xcodeproj/project.pbxproj b/form_app/ios/Runner.xcodeproj/project.pbxproj index c9bf7195ba7..d8d5923f748 100644 --- a/form_app/ios/Runner.xcodeproj/project.pbxproj +++ b/form_app/ios/Runner.xcodeproj/project.pbxproj @@ -8,12 +8,12 @@ /* 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 */; }; 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 */; }; - BDE5661AA8A4C563FCF078A2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12B8E75930F7189098FE2E89 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -30,16 +30,15 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 12B8E75930F7189098FE2E89 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 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 = ""; }; - 276F72D994491BBB4665D412 /* 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 = ""; }; - 397613D7A6E370D6BC5801D6 /* 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 = ""; }; - 52C6F544F0ADBAD3196A033E /* 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 = ""; }; 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 = ""; }; 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; }; @@ -47,6 +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 = ""; }; + 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,21 +54,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BDE5661AA8A4C563FCF078A2 /* Pods_Runner.framework in Frameworks */, + 3766E7D372A09850A29A527B /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 43266579D3D35E34BF895DB1 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 12B8E75930F7189098FE2E89 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -86,8 +78,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - C316D5E1E0A2A881F8AA6F0E /* Pods */, - 43266579D3D35E34BF895DB1 /* Frameworks */, + EF79CD33CFDCF74DE7C10B5A /* Pods */, + EF9128E56C18321704624C97 /* Frameworks */, ); sourceTree = ""; }; @@ -114,17 +106,25 @@ path = Runner; sourceTree = ""; }; - C316D5E1E0A2A881F8AA6F0E /* Pods */ = { + EF79CD33CFDCF74DE7C10B5A /* Pods */ = { isa = PBXGroup; children = ( - 276F72D994491BBB4665D412 /* Pods-Runner.debug.xcconfig */, - 52C6F544F0ADBAD3196A033E /* Pods-Runner.release.xcconfig */, - 397613D7A6E370D6BC5801D6 /* Pods-Runner.profile.xcconfig */, + 0E909B33AFD434F306ACCA3C /* Pods-Runner.debug.xcconfig */, + CFB78930BCED44AFB7692679 /* Pods-Runner.release.xcconfig */, + 8CCF6655111C0B16FDDC34F9 /* 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 = ( - 98E29F2406818CA450C9FEB7 /* [CP] Check Pods Manifest.lock */, + F25D53060A56EAD76DB45362 /* [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"; }; - 98E29F2406818CA450C9FEB7 /* [CP] Check Pods Manifest.lock */ = { + F25D53060A56EAD76DB45362 /* [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/form_app/ios/Runner/Info.plist b/form_app/ios/Runner/Info.plist index 5ead2faec7d..38e98fdee24 100644 --- a/form_app/ios/Runner/Info.plist +++ b/form_app/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/form_app/lib/src/validation.dart b/form_app/lib/src/validation.dart index 4d0f899f3c1..74c1f4a9718 100644 --- a/form_app/lib/src/validation.dart +++ b/form_app/lib/src/validation.dart @@ -27,10 +27,7 @@ class _FormValidationDemoState extends State { Padding( padding: const EdgeInsets.all(8), child: TextButton( - style: TextButton.styleFrom( - // ignore: deprecated_member_use - primary: Colors.white, - ), + style: TextButton.styleFrom(foregroundColor: Colors.white), child: const Text('Submit'), onPressed: () { // Validate the form by getting the FormState from the GlobalKey diff --git a/form_app/macos/Runner.xcodeproj/project.pbxproj b/form_app/macos/Runner.xcodeproj/project.pbxproj index 5ad30737d2f..f6bc14fce97 100644 --- a/form_app/macos/Runner.xcodeproj/project.pbxproj +++ b/form_app/macos/Runner.xcodeproj/project.pbxproj @@ -21,12 +21,12 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 0CD9AC8D2B3BDF840B82E691 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 517FBF6D8835FBC35870D36F /* 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 */; }; + A1F0BFFB6F9FA14106EAE3EE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 856473EAF8CF89E799479CE6 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,6 +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 = ""; }; 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; }; @@ -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 = ""; }; - 49051A679B9E39695623AB02 /* 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 = ""; }; - 4A2DDD892F9D8D31553F2A34 /* 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 = ""; }; - 517FBF6D8835FBC35870D36F /* 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 = ""; }; + 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 = ""; }; - DCD037802252568E9CFBC789 /* 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 = ""; }; + 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0CD9AC8D2B3BDF840B82E691 /* Pods_Runner.framework in Frameworks */, + A1F0BFFB6F9FA14106EAE3EE /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - A4F6194B7BF82D2701269518 /* Pods */, + A82934A73121DAFD6D1DB4E7 /* Pods */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = Runner; sourceTree = ""; }; - A4F6194B7BF82D2701269518 /* Pods */ = { + A82934A73121DAFD6D1DB4E7 /* Pods */ = { isa = PBXGroup; children = ( - DCD037802252568E9CFBC789 /* Pods-Runner.debug.xcconfig */, - 49051A679B9E39695623AB02 /* Pods-Runner.release.xcconfig */, - 4A2DDD892F9D8D31553F2A34 /* Pods-Runner.profile.xcconfig */, + 9059A008AAF982E2AA81E7FD /* Pods-Runner.debug.xcconfig */, + C967532271F6A636305589EE /* Pods-Runner.release.xcconfig */, + 126F45D6E712A1389E6DCD35 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +166,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 517FBF6D8835FBC35870D36F /* Pods_Runner.framework */, + 856473EAF8CF89E799479CE6 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - B117B08F4ADB75FD2A510E0A /* [CP] Check Pods Manifest.lock */, + 1A8E813EC05C89AF241D66B7 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 705D8DCB9BF5611562B61EE0 /* [CP] Embed Pods Frameworks */, + 8AAAE696263490D7C35ED98D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -254,7 +254,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3399D490228B24CF009A79C7 /* ShellScript */ = { + 1A8E813EC05C89AF241D66B7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -262,72 +262,72 @@ 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 = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + 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; }; - 33CC111E2044C6BF0003C045 /* ShellScript */ = { + 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, ); inputPaths = ( - Flutter/ephemeral/tripwire, ); outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; }; - 705D8DCB9BF5611562B61EE0 /* [CP] Embed Pods Frameworks */ = { + 33CC111E2044C6BF0003C045 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, ); - name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - B117B08F4ADB75FD2A510E0A /* [CP] Check Pods Manifest.lock */ = { + 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", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7ca8..82b6f9d9a33 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc164216..13b35eba55c 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be613897..0a3f5fa40fb 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2f2..bdb57226d5f 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a6528647..f083318e09c 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a726136a..326c0e72c9d 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd3f..2f1632cfddf 100644 Binary files a/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/form_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/form_app/windows/runner/CMakeLists.txt b/form_app/windows/runner/CMakeLists.txt index b9e550fba8e..17411a8ab8e 100644 --- a/form_app/windows/runner/CMakeLists.txt +++ b/form_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/form_app/windows/runner/Runner.rc b/form_app/windows/runner/Runner.rc index 944228e667e..7154c24afc8 100644 --- a/form_app/windows/runner/Runner.rc +++ b/form_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/form_app/windows/runner/runner.exe.manifest b/form_app/windows/runner/runner.exe.manifest index c977c4a4258..a42ea7687cb 100644 --- a/form_app/windows/runner/runner.exe.manifest +++ b/form_app/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/isolate_example/.metadata b/isolate_example/.metadata index dc63d7b52e0..8dd2f8d1312 100644 --- a/isolate_example/.metadata +++ b/isolate_example/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + channel: beta project_type: app @@ -13,23 +13,23 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: linux - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: macos - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: windows - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 # User provided section diff --git a/isolate_example/android/gradle/wrapper/gradle-wrapper.properties b/isolate_example/android/gradle/wrapper/gradle-wrapper.properties index cc5527d781a..cb24abda10a 100644 --- a/isolate_example/android/gradle/wrapper/gradle-wrapper.properties +++ b/isolate_example/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/isolate_example/ios/Flutter/AppFrameworkInfo.plist b/isolate_example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f977a..9625e105df3 100644 --- a/isolate_example/ios/Flutter/AppFrameworkInfo.plist +++ b/isolate_example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/isolate_example/ios/Podfile b/isolate_example/ios/Podfile index 1e8c3c90a55..88359b225fa 100644 --- a/isolate_example/ios/Podfile +++ b/isolate_example/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/isolate_example/ios/Runner.xcodeproj/project.pbxproj b/isolate_example/ios/Runner.xcodeproj/project.pbxproj index 6e4597e2c85..f801253daa2 100644 --- a/isolate_example/ios/Runner.xcodeproj/project.pbxproj +++ b/isolate_example/ios/Runner.xcodeproj/project.pbxproj @@ -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/isolate_example/ios/Runner/Info.plist b/isolate_example/ios/Runner/Info.plist index e86c899121a..f4358027c0c 100644 --- a/isolate_example/ios/Runner/Info.plist +++ b/isolate_example/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/isolate_example/lib/data_transfer_page.dart b/isolate_example/lib/data_transfer_page.dart index c764a7b5499..63116b8137d 100644 --- a/isolate_example/lib/data_transfer_page.dart +++ b/isolate_example/lib/data_transfer_page.dart @@ -60,7 +60,7 @@ class DataTransferPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - primary: (controller.runningTest == 1) + foregroundColor: (controller.runningTest == 1) ? Colors.blueAccent : Colors.grey[300]), onPressed: () => controller.generateRandomNumbers(false), @@ -68,7 +68,7 @@ class DataTransferPage extends StatelessWidget { ), ElevatedButton( style: ElevatedButton.styleFrom( - primary: (controller.runningTest == 2) + foregroundColor: (controller.runningTest == 2) ? Colors.blueAccent : Colors.grey[300]), onPressed: () => controller.generateRandomNumbers(true), @@ -76,7 +76,7 @@ class DataTransferPage extends StatelessWidget { ), ElevatedButton( style: ElevatedButton.styleFrom( - primary: (controller.runningTest == 3) + foregroundColor: (controller.runningTest == 3) ? Colors.blueAccent : Colors.grey[300]), onPressed: controller.generateOnSecondaryIsolate, diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7ca8..82b6f9d9a33 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc164216..13b35eba55c 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be613897..0a3f5fa40fb 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2f2..bdb57226d5f 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a6528647..f083318e09c 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a726136a..326c0e72c9d 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd3f..2f1632cfddf 100644 Binary files a/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/isolate_example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/isolate_example/windows/runner/CMakeLists.txt b/isolate_example/windows/runner/CMakeLists.txt index b9e550fba8e..17411a8ab8e 100644 --- a/isolate_example/windows/runner/CMakeLists.txt +++ b/isolate_example/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/isolate_example/windows/runner/Runner.rc b/isolate_example/windows/runner/Runner.rc index 19bff55f897..42c4b7004f6 100644 --- a/isolate_example/windows/runner/Runner.rc +++ b/isolate_example/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/isolate_example/windows/runner/runner.exe.manifest b/isolate_example/windows/runner/runner.exe.manifest index c977c4a4258..a42ea7687cb 100644 --- a/isolate_example/windows/runner/runner.exe.manifest +++ b/isolate_example/windows/runner/runner.exe.manifest @@ -7,7 +7,7 @@ - + diff --git a/place_tracker/.metadata b/place_tracker/.metadata index 4c7eb5a5891..dac7f13837d 100644 --- a/place_tracker/.metadata +++ b/place_tracker/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + channel: beta project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: web - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 # User provided section diff --git a/place_tracker/android/gradle/wrapper/gradle-wrapper.properties b/place_tracker/android/gradle/wrapper/gradle-wrapper.properties index cc5527d781a..cb24abda10a 100644 --- a/place_tracker/android/gradle/wrapper/gradle-wrapper.properties +++ b/place_tracker/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/place_tracker/codelab_rebuild.yaml b/place_tracker/codelab_rebuild.yaml index 005b43c78dd..e26198ac2b7 100644 --- a/place_tracker/codelab_rebuild.yaml +++ b/place_tracker/codelab_rebuild.yaml @@ -48,3 +48,29 @@ steps: GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + - name: Patch ios/Flutter/AppFrameworkInfo.plist + path: ios/Flutter/AppFrameworkInfo.plist + patch-u: | + --- b/place_tracker/ios/Flutter/AppFrameworkInfo.plist + +++ a/place_tracker/ios/Flutter/AppFrameworkInfo.plist + @@ -21,6 +21,6 @@ + CFBundleVersion + 1.0 + MinimumOSVersion + - 11.0 + + 13.0 + + + - name: Patch ios/Podfile + path: ios/Podfile + patch-u: | + --- b/place_tracker/ios/Podfile + +++ a/place_tracker/ios/Podfile + @@ -1,5 +1,5 @@ + -# Uncomment this line to define a global platform for your project + -# platform :ios, '11.0' + +# Google Maps requires iOS 13: https://developers.google.com/maps/documentation/ios-sdk/overview#supported_platforms + +platform :ios, '13.0' + + # CocoaPods analytics sends network stats synchronously affecting flutter build latency. + ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/place_tracker/ios/Flutter/AppFrameworkInfo.plist b/place_tracker/ios/Flutter/AppFrameworkInfo.plist index 8d4492f977a..1dc6cf7652b 100644 --- a/place_tracker/ios/Flutter/AppFrameworkInfo.plist +++ b/place_tracker/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 13.0 diff --git a/place_tracker/ios/Podfile b/place_tracker/ios/Podfile index 1e8c3c90a55..a2d54ed59ab 100644 --- a/place_tracker/ios/Podfile +++ b/place_tracker/ios/Podfile @@ -1,5 +1,5 @@ -# Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# Google Maps requires iOS 13: https://developers.google.com/maps/documentation/ios-sdk/overview#supported_platforms +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/place_tracker/ios/Runner.xcodeproj/project.pbxproj b/place_tracker/ios/Runner.xcodeproj/project.pbxproj index 3e7dd4aca53..c11acdd35bc 100644 --- a/place_tracker/ios/Runner.xcodeproj/project.pbxproj +++ b/place_tracker/ios/Runner.xcodeproj/project.pbxproj @@ -8,12 +8,12 @@ /* 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 */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - D9854B83EAA6ACC60E4F6B2D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F991A27FB85E2A7936B669A /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,13 +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 = ""; }; + 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 = ""; }; - 55B272E1845E2A664BBBBEEB /* 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 = ""; }; - 6466B3CC2D3AEB5CDEF45CEF /* 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 = ""; }; + 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 = ""; }; - 8F991A27FB85E2A7936B669A /* 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; 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 +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 = ""; }; - E38A72C4C333A370F2F6C249 /* 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 = ""; }; + 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,32 +54,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D9854B83EAA6ACC60E4F6B2D /* Pods_Runner.framework in Frameworks */, + 1B0B687765671D02A60CBD14 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 09B94E5F01F50739EC10E796 /* Frameworks */ = { + 036F98622E11B4F2B0BCF301 /* Frameworks */ = { isa = PBXGroup; children = ( - 8F991A27FB85E2A7936B669A /* Pods_Runner.framework */, + E233B6908465722B8E42EBC0 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; }; - 26A3A88053E46335F491246D /* Pods */ = { - isa = PBXGroup; - children = ( - E38A72C4C333A370F2F6C249 /* Pods-Runner.debug.xcconfig */, - 6466B3CC2D3AEB5CDEF45CEF /* Pods-Runner.release.xcconfig */, - 55B272E1845E2A664BBBBEEB /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -97,8 +86,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 26A3A88053E46335F491246D /* Pods */, - 09B94E5F01F50739EC10E796 /* Frameworks */, + A3DF4EB277490E0CD5D69E8B /* Pods */, + 036F98622E11B4F2B0BCF301 /* Frameworks */, ); sourceTree = ""; }; @@ -125,6 +114,17 @@ 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 +132,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9221AD7A7F819DA87FA7EEB2 /* [CP] Check Pods Manifest.lock */, + 9DB85FE04FBD27C3AAF4FB01 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - C8A2931DCF641504414C2007 /* [CP] Copy Pods Resources */, + 16727DDEE57463EA4EBA04E5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -198,41 +198,36 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 16727DDEE57463EA4EBA04E5 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputPaths = ( + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "Thin Binary"; - outputPaths = ( + 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 = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; }; - 9221AD7A7F819DA87FA7EEB2 /* [CP] Check Pods Manifest.lock */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( ); + name = "Thin Binary"; 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; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -248,21 +243,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C8A2931DCF641504414C2007 /* [CP] Copy Pods Resources */ = { + 9DB85FE04FBD27C3AAF4FB01 /* [CP] Check Pods Manifest.lock */ = { 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"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + 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 */ @@ -340,7 +340,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; @@ -417,7 +417,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; @@ -466,7 +466,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/place_tracker/ios/Runner/Info.plist b/place_tracker/ios/Runner/Info.plist index 538ec0e9ce1..b116632a7ef 100644 --- a/place_tracker/ios/Runner/Info.plist +++ b/place_tracker/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/place_tracker/lib/place_map.dart b/place_tracker/lib/place_map.dart index 7f7d5f96f52..f1f8efc9ce4 100644 --- a/place_tracker/lib/place_map.dart +++ b/place_tracker/lib/place_map.dart @@ -469,10 +469,7 @@ class _AddPlaceButtonBar extends StatelessWidget { alignment: MainAxisAlignment.center, children: [ ElevatedButton( - style: ElevatedButton.styleFrom( - // ignore: deprecated_member_use - primary: Colors.blue, - ), + style: ElevatedButton.styleFrom(foregroundColor: Colors.blue), onPressed: onSavePressed, child: const Text( 'Save', @@ -480,10 +477,7 @@ class _AddPlaceButtonBar extends StatelessWidget { ), ), ElevatedButton( - style: ElevatedButton.styleFrom( - // ignore: deprecated_member_use - primary: Colors.red, - ), + style: ElevatedButton.styleFrom(foregroundColor: Colors.red), onPressed: onCancelPressed, child: const Text( 'Cancel', @@ -520,11 +514,10 @@ class _CategoryButtonBar extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // ignore: deprecated_member_use - primary: selectedPlaceCategory == PlaceCategory.favorite - ? Colors.green[700] - : Colors.lightGreen, - ), + foregroundColor: + selectedPlaceCategory == PlaceCategory.favorite + ? Colors.green[700] + : Colors.lightGreen), child: const Text( 'Favorites', style: TextStyle(color: Colors.white, fontSize: 14.0), @@ -533,11 +526,10 @@ class _CategoryButtonBar extends StatelessWidget { ), ElevatedButton( style: ElevatedButton.styleFrom( - // ignore: deprecated_member_use - primary: selectedPlaceCategory == PlaceCategory.visited - ? Colors.green[700] - : Colors.lightGreen, - ), + foregroundColor: + selectedPlaceCategory == PlaceCategory.visited + ? Colors.green[700] + : Colors.lightGreen), child: const Text( 'Visited', style: TextStyle(color: Colors.white, fontSize: 14.0), @@ -546,11 +538,10 @@ class _CategoryButtonBar extends StatelessWidget { ), ElevatedButton( style: ElevatedButton.styleFrom( - // ignore: deprecated_member_use - primary: selectedPlaceCategory == PlaceCategory.wantToGo - ? Colors.green[700] - : Colors.lightGreen, - ), + foregroundColor: + selectedPlaceCategory == PlaceCategory.wantToGo + ? Colors.green[700] + : Colors.lightGreen), child: const Text( 'Want To Go', style: TextStyle(color: Colors.white, fontSize: 14.0), diff --git a/platform_channels/.metadata b/platform_channels/.metadata index 985adcc5437..86286ffa865 100644 --- a/platform_channels/.metadata +++ b/platform_channels/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + channel: beta project_type: app @@ -13,14 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 - platform: ios - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 + base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949 # User provided section diff --git a/platform_channels/android/gradle/wrapper/gradle-wrapper.properties b/platform_channels/android/gradle/wrapper/gradle-wrapper.properties index cc5527d781a..cb24abda10a 100644 --- a/platform_channels/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform_channels/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_channels/ios/Flutter/AppFrameworkInfo.plist b/platform_channels/ios/Flutter/AppFrameworkInfo.plist index 8d4492f977a..9625e105df3 100644 --- a/platform_channels/ios/Flutter/AppFrameworkInfo.plist +++ b/platform_channels/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/platform_channels/ios/Runner.xcodeproj/project.pbxproj b/platform_channels/ios/Runner.xcodeproj/project.pbxproj index 7acdff921e5..fade5e471a0 100644 --- a/platform_channels/ios/Runner.xcodeproj/project.pbxproj +++ b/platform_channels/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_channels/ios/Runner/Info.plist b/platform_channels/ios/Runner/Info.plist index 3182dee5c9c..bded2b9793f 100644 --- a/platform_channels/ios/Runner/Info.plist +++ b/platform_channels/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/platform_channels/lib/src/image_basic_message_channel.dart b/platform_channels/lib/src/image_basic_message_channel.dart index 240bd6b6f97..98c774940a5 100644 --- a/platform_channels/lib/src/image_basic_message_channel.dart +++ b/platform_channels/lib/src/image_basic_message_channel.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:typed_data'; - import 'package:flutter/services.dart'; /// This class manages a [BasicMessageChannel] that can return an image loaded diff --git a/platform_channels/lib/src/platform_image_demo.dart b/platform_channels/lib/src/platform_image_demo.dart index 25eb4d66f38..6d88b548f51 100644 --- a/platform_channels/lib/src/platform_image_demo.dart +++ b/platform_channels/lib/src/platform_image_demo.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:typed_data'; - import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:platform_channels/src/image_basic_message_channel.dart'; diff --git a/provider_shopper/lib/screens/cart.dart b/provider_shopper/lib/screens/cart.dart index 35d4854a144..a346b434c4d 100644 --- a/provider_shopper/lib/screens/cart.dart +++ b/provider_shopper/lib/screens/cart.dart @@ -90,10 +90,7 @@ class _CartTotal extends StatelessWidget { ScaffoldMessenger.of(context).showSnackBar( const SnackBar(content: Text('Buying not supported yet.'))); }, - style: TextButton.styleFrom( - // ignore: deprecated_member_use - primary: Colors.white, - ), + style: TextButton.styleFrom(foregroundColor: Colors.white), child: const Text('BUY'), ), ], diff --git a/provider_shopper/lib/screens/login.dart b/provider_shopper/lib/screens/login.dart index 7c143021e5c..1aa7fcbe3dd 100644 --- a/provider_shopper/lib/screens/login.dart +++ b/provider_shopper/lib/screens/login.dart @@ -39,8 +39,7 @@ class MyLogin extends StatelessWidget { Navigator.pushReplacementNamed(context, '/catalog'); }, style: ElevatedButton.styleFrom( - // ignore: deprecated_member_use - primary: Colors.yellow, + foregroundColor: Colors.yellow, ), child: const Text('ENTER'), ) diff --git a/simplistic_editor/lib/basic_text_input_client.dart b/simplistic_editor/lib/basic_text_input_client.dart index 8f394b0317b..ae601f82bb8 100644 --- a/simplistic_editor/lib/basic_text_input_client.dart +++ b/simplistic_editor/lib/basic_text_input_client.dart @@ -697,22 +697,17 @@ class BasicTextInputClientState extends State { // Activation const SingleActivator(LogicalKeyboardKey.space): - // ignore: prefer_const_constructors - DoNothingAndStopPropagationIntent(), + const DoNothingAndStopPropagationIntent(), // Scrolling const SingleActivator(LogicalKeyboardKey.arrowUp): - // ignore: prefer_const_constructors - DoNothingAndStopPropagationIntent(), + const DoNothingAndStopPropagationIntent(), const SingleActivator(LogicalKeyboardKey.arrowDown): - // ignore: prefer_const_constructors - DoNothingAndStopPropagationIntent(), + const DoNothingAndStopPropagationIntent(), const SingleActivator(LogicalKeyboardKey.arrowLeft): - // ignore: prefer_const_constructors - DoNothingAndStopPropagationIntent(), + const DoNothingAndStopPropagationIntent(), const SingleActivator(LogicalKeyboardKey.arrowRight): - // ignore: prefer_const_constructors - DoNothingAndStopPropagationIntent(), + const DoNothingAndStopPropagationIntent(), }; @override diff --git a/testing_app/lib/screens/home.dart b/testing_app/lib/screens/home.dart index 5ba14eed59d..0ff150e97a7 100644 --- a/testing_app/lib/screens/home.dart +++ b/testing_app/lib/screens/home.dart @@ -19,7 +19,7 @@ class HomePage extends StatelessWidget { title: const Text('Testing Sample'), actions: [ TextButton.icon( - style: TextButton.styleFrom(primary: Colors.white), + style: TextButton.styleFrom(foregroundColor: Colors.white), onPressed: () { Navigator.pushNamed(context, FavoritesPage.routeName); }, diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index 84083298f09..ec569675e98 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -8,49 +8,37 @@ 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" + "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" - # TODO(domesticmouse): re-enable when stable increments - # "desktop_photo_search/fluent_ui" - # TODO(domesticmouse): re-enable when stable increments - # "desktop_photo_search/material" + "desktop_photo_search/fluent_ui" + "desktop_photo_search/material" "experimental/federated_plugin/federated_plugin" - # TODO(domesticmouse): re-enable when stable increments - # "experimental/web_dashboard" + "experimental/web_dashboard" "experimental/linting_tool" "flutter_maps_firestore" - # TODO(domesticmouse): re-enable when stable increments - # "form_app" + "form_app" "game_template" "infinite_list" "ios_app_clip" - # TODO(domesticmouse): re-enable when stable increments - # "isolate_example" + "isolate_example" "jsonexample" - # TODO(domesticmouse): re-enable when stable increments - # "material_3_demo" + "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" + "place_tracker" + "platform_channels" "platform_design" "platform_view_swift" "provider_counter" - # TODO(domesticmouse): re-enable when stable increments - # "provider_shopper" - # TODO(domesticmouse): re-enable when stable increments - # "simplistic_editor" - # TODO(domesticmouse): re-enable when stable increments - # "testing_app" + "provider_shopper" + "simplistic_editor" + "testing_app" "veggieseasons" )