From f1fd4341ffbaf9e166eaa87882da6d678fd5cc5d Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Thu, 17 Aug 2023 06:26:43 +1000 Subject: [PATCH] Flutter beta (#1952) --- analysis_defaults/pubspec.yaml | 2 +- android_splash_screen/pubspec.yaml | 2 +- animations/.metadata | 34 +- animations/android/app/build.gradle | 19 +- animations/android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 3 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- animations/ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- animations/pubspec.yaml | 2 +- animations/web/index.html | 2 +- animations/windows/CMakeLists.txt | 2 +- animations/windows/runner/flutter_window.cpp | 5 + background_isolate_channels/pubspec.yaml | 2 +- code_sharing/client/pubspec.yaml | 2 +- code_sharing/server/pubspec.yaml | 2 +- code_sharing/shared/pubspec.yaml | 2 +- deeplink_store_example/pubspec.yaml | 2 +- desktop_photo_search/fluent_ui/.metadata | 22 +- .../macos/Runner.xcodeproj/project.pbxproj | 100 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../contents.xcworkspacedata | 3 - desktop_photo_search/fluent_ui/pubspec.yaml | 2 +- .../fluent_ui/windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + desktop_photo_search/material/.metadata | 22 +- .../macos/Runner.xcodeproj/project.pbxproj | 98 +- .../contents.xcworkspacedata | 3 - desktop_photo_search/material/pubspec.yaml | 2 +- .../material/windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + .../lib/modified_action_page.dart | 2 +- experimental/context_menus/pubspec.yaml | 2 +- .../federated_plugin/example/pubspec.yaml | 2 +- .../federated_plugin/pubspec.yaml | 2 +- .../federated_plugin_macos/pubspec.yaml | 2 +- .../pubspec.yaml | 2 +- .../federated_plugin_web/pubspec.yaml | 2 +- .../federated_plugin_windows/pubspec.yaml | 2 +- experimental/linting_tool/pubspec.yaml | 2 +- experimental/material_3_demo/pubspec.yaml | 2 +- experimental/pedometer/example/pubspec.yaml | 2 +- .../pedometer/lib/health_connect.dart | 1063 +++++++++-------- .../lib/pedometer_bindings_generated.dart | 146 +-- experimental/pedometer/pubspec.yaml | 2 +- experimental/varfont_shader_puzzle/.metadata | 30 +- .../android/app/build.gradle | 19 +- .../android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 143 +-- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 134 +-- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../varfont_shader_puzzle/pubspec.yaml | 2 +- .../windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + experimental/web_dashboard/pubspec.yaml | 2 +- flutter_maps_firestore/.metadata | 14 +- .../ios/Runner.xcodeproj/project.pbxproj | 3 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- flutter_maps_firestore/ios/Runner/Info.plist | 2 - form_app/.metadata | 34 +- form_app/android/app/build.gradle | 19 +- form_app/android/settings.gradle | 25 +- form_app/ios/Runner.xcodeproj/project.pbxproj | 75 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- form_app/ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 92 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- form_app/pubspec.yaml | 2 +- form_app/web/index.html | 2 +- form_app/windows/CMakeLists.txt | 2 +- form_app/windows/runner/flutter_window.cpp | 5 + .../lib/src/audio/audio_controller.dart | 1 + game_template/pubspec.yaml | 2 +- google_maps/pubspec.yaml | 2 +- infinite_list/.metadata | 34 +- infinite_list/android/app/build.gradle | 19 +- infinite_list/android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 121 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- infinite_list/ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 108 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- infinite_list/pubspec.yaml | 2 +- infinite_list/web/index.html | 2 +- infinite_list/windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + ios_app_clip/pubspec.yaml | 2 +- isolate_example/.metadata | 30 +- isolate_example/android/app/build.gradle | 20 +- .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../app/src/profile/AndroidManifest.xml | 3 +- isolate_example/android/build.gradle | 2 +- isolate_example/android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 111 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- isolate_example/ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 64 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../macos/Runner/MainFlutterWindow.swift | 2 +- isolate_example/pubspec.yaml | 2 +- isolate_example/windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + jsonexample/.metadata | 34 +- jsonexample/android/app/build.gradle | 19 +- jsonexample/android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 111 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- jsonexample/ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 110 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- jsonexample/pubspec.yaml | 2 +- jsonexample/web/index.html | 2 +- jsonexample/windows/CMakeLists.txt | 2 +- jsonexample/windows/runner/flutter_window.cpp | 5 + material_3_demo/pubspec.yaml | 2 +- navigation_and_routing/.metadata | 34 +- .../android/app/build.gradle | 19 +- .../android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 3 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- navigation_and_routing/ios/Runner/Info.plist | 2 - .../lib/src/routing/parser.dart | 7 +- .../lib/src/routing/route_state.dart | 4 +- .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- navigation_and_routing/pubspec.yaml | 2 +- navigation_and_routing/web/index.html | 2 +- navigation_and_routing/windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + next_gen_ui_demo/pubspec.yaml | 2 +- place_tracker/.metadata | 22 +- place_tracker/android/app/build.gradle | 19 +- place_tracker/android/settings.gradle | 25 +- place_tracker/codelab_rebuild.yaml | 4 +- .../ios/Runner.xcodeproj/project.pbxproj | 113 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- place_tracker/ios/Runner/Info.plist | 2 - place_tracker/pubspec.yaml | 2 +- place_tracker/web/index.html | 2 +- platform_channels/.metadata | 18 +- platform_channels/android/app/build.gradle | 17 +- .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../app/src/profile/AndroidManifest.xml | 3 +- platform_channels/android/build.gradle | 2 +- platform_channels/android/settings.gradle | 27 +- platform_channels/codelab_rebuild.yaml | 23 +- .../ios/Runner.xcodeproj/project.pbxproj | 3 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- platform_channels/ios/Runner/Info.plist | 2 - platform_channels/pubspec.yaml | 2 +- platform_design/.metadata | 22 +- platform_design/android/app/build.gradle | 19 +- platform_design/android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 3 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- platform_design/ios/Runner/Info.plist | 2 - platform_design/pubspec.yaml | 2 +- platform_design/web/index.html | 2 +- platform_view_swift/pubspec.yaml | 2 +- provider_counter/pubspec.yaml | 2 +- provider_shopper/.metadata | 34 +- provider_shopper/android/app/build.gradle | 19 +- provider_shopper/android/settings.gradle | 25 +- .../ios/Runner.xcodeproj/project.pbxproj | 117 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- provider_shopper/ios/Runner/Info.plist | 2 - .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- provider_shopper/pubspec.yaml | 2 +- provider_shopper/web/index.html | 2 +- provider_shopper/windows/CMakeLists.txt | 2 +- .../windows/runner/flutter_window.cpp | 5 + simple_shader/pubspec.yaml | 2 +- simplistic_calculator/pubspec.yaml | 2 +- simplistic_editor/lib/basic_text_field.dart | 2 + .../lib/basic_text_input_client.dart | 38 + simplistic_editor/pubspec.yaml | 2 +- testing_app/pubspec.yaml | 2 +- tool/flutter_ci_script_beta.sh | 21 +- tool/flutter_ci_script_master.sh | 23 +- veggieseasons/pubspec.yaml | 2 +- web/_tool/pubspec.yaml | 2 +- web/samples_index/pubspec.yaml | 2 +- .../element_embedding_demo/pubspec.yaml | 2 +- 189 files changed, 1956 insertions(+), 2041 deletions(-) diff --git a/analysis_defaults/pubspec.yaml b/analysis_defaults/pubspec.yaml index 5c6892f4e..f0c66d118 100644 --- a/analysis_defaults/pubspec.yaml +++ b/analysis_defaults/pubspec.yaml @@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 # NOTE: Code is not allowed in this package. Do not add dependencies. dependencies: diff --git a/android_splash_screen/pubspec.yaml b/android_splash_screen/pubspec.yaml index 16b8a894a..2036cd07f 100644 --- a/android_splash_screen/pubspec.yaml +++ b/android_splash_screen/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/animations/.metadata b/animations/.metadata index e94891d5f..0e49e8aa9 100644 --- a/animations/.metadata +++ b/animations/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: web - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/animations/android/app/build.gradle b/animations/android/app/build.gradle index d53967702..7d2eca0f9 100644 --- a/animations/android/app/build.gradle +++ b/animations/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "dev.flutter.animations" compileSdkVersion flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/animations/android/settings.gradle b/animations/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/animations/android/settings.gradle +++ b/animations/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/animations/ios/Runner.xcodeproj/project.pbxproj b/animations/ios/Runner.xcodeproj/project.pbxproj index e01f933c5..9cb57dfd5 100644 --- a/animations/ios/Runner.xcodeproj/project.pbxproj +++ b/animations/ios/Runner.xcodeproj/project.pbxproj @@ -168,7 +168,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { diff --git a/animations/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/animations/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e42adcb34..87131a09b 100644 --- a/animations/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/animations/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/animations/macos/Runner.xcodeproj/project.pbxproj b/animations/macos/Runner.xcodeproj/project.pbxproj index 0b22cf7ab..581f568a8 100644 --- a/animations/macos/Runner.xcodeproj/project.pbxproj +++ b/animations/macos/Runner.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/animations/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/animations/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c52d2ebcf..ca47b8b64 100644 --- a/animations/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/animations/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ // The value below is injected by flutter build, do not touch. - var serviceWorkerVersion = null; + const serviceWorkerVersion = null; diff --git a/animations/windows/CMakeLists.txt b/animations/windows/CMakeLists.txt index 92f47303e..624ce34e9 100644 --- a/animations/windows/CMakeLists.txt +++ b/animations/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "animations") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/animations/windows/runner/flutter_window.cpp b/animations/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/animations/windows/runner/flutter_window.cpp +++ b/animations/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/background_isolate_channels/pubspec.yaml b/background_isolate_channels/pubspec.yaml index 5ef35dcd2..05832a3bc 100644 --- a/background_isolate_channels/pubspec.yaml +++ b/background_isolate_channels/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: cupertino_icons: ^1.0.2 diff --git a/code_sharing/client/pubspec.yaml b/code_sharing/client/pubspec.yaml index 2224661fb..ec6f318d2 100644 --- a/code_sharing/client/pubspec.yaml +++ b/code_sharing/client/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: cupertino_icons: ^1.0.2 diff --git a/code_sharing/server/pubspec.yaml b/code_sharing/server/pubspec.yaml index aa35bd81a..c7f09a628 100644 --- a/code_sharing/server/pubspec.yaml +++ b/code_sharing/server/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: "none" environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: args: ^2.0.0 diff --git a/code_sharing/shared/pubspec.yaml b/code_sharing/shared/pubspec.yaml index 9f9be64b7..458269717 100644 --- a/code_sharing/shared/pubspec.yaml +++ b/code_sharing/shared/pubspec.yaml @@ -3,7 +3,7 @@ description: Common data models required by our client and server version: 1.0.0 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: freezed_annotation: ^2.1.0 diff --git a/deeplink_store_example/pubspec.yaml b/deeplink_store_example/pubspec.yaml index 737d8abf3..180325109 100644 --- a/deeplink_store_example/pubspec.yaml +++ b/deeplink_store_example/pubspec.yaml @@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/desktop_photo_search/fluent_ui/.metadata b/desktop_photo_search/fluent_ui/.metadata index 9abf315c6..931b79989 100644 --- a/desktop_photo_search/fluent_ui/.metadata +++ b/desktop_photo_search/fluent_ui/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # 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 156c472e4..b743d0dd9 100644 --- a/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj +++ b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,12 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 2EB81F92B5B3D9406E5675AE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADF104A519B11B2B3BE11F71 /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 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 */; }; - 6E5C12AAF9B1CA214280C0C4 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21D636392EA0BAEB2CB39D2A /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,14 +60,11 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 02CF3BCE70217153611FB9D2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 1785C1D5EF403E35A45FEA0F /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 21D636392EA0BAEB2CB39D2A /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; 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; }; + 33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "desktop_photo_search.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -81,13 +76,8 @@ 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 = ""; }; - 64C0AD5359F6FC65D1BE981A /* 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 = ""; }; - 68AD699C6D97A7402DE464C5 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.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 = ""; }; - A7875D4E25C419F028F9BEBB /* 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 = ""; }; - ADF104A519B11B2B3BE11F71 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F687323AB9C4FDD6EBDB5E5E /* 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 */ @@ -95,7 +85,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6E5C12AAF9B1CA214280C0C4 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +92,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2EB81F92B5B3D9406E5675AE /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +125,6 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - B802D0AC911EB58210C8544F /* Pods */, ); sourceTree = ""; }; @@ -185,25 +172,9 @@ path = Runner; sourceTree = ""; }; - B802D0AC911EB58210C8544F /* Pods */ = { - isa = PBXGroup; - children = ( - F687323AB9C4FDD6EBDB5E5E /* Pods-Runner.debug.xcconfig */, - 64C0AD5359F6FC65D1BE981A /* Pods-Runner.release.xcconfig */, - A7875D4E25C419F028F9BEBB /* Pods-Runner.profile.xcconfig */, - 68AD699C6D97A7402DE464C5 /* Pods-RunnerTests.debug.xcconfig */, - 02CF3BCE70217153611FB9D2 /* Pods-RunnerTests.release.xcconfig */, - 1785C1D5EF403E35A45FEA0F /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - ADF104A519B11B2B3BE11F71 /* Pods_Runner.framework */, - 21D636392EA0BAEB2CB39D2A /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +186,6 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 4C4AB0314587EB9DAAF1138A /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +204,11 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 0E4842B1A98ADB7FACBEA1A5 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - B5727BD40F6B74C1CFFD3E8A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -259,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -322,28 +290,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0E4842B1A98ADB7FACBEA1A5 /* [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; alwaysOutOfDate = 1; @@ -382,45 +328,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 4C4AB0314587EB9DAAF1138A /* [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-RunnerTests-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; - }; - B5727BD40F6B74C1CFFD3E8A /* [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 */ @@ -472,7 +379,6 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 68AD699C6D97A7402DE464C5 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -487,7 +393,6 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 02CF3BCE70217153611FB9D2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -502,7 +407,6 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1785C1D5EF403E35A45FEA0F /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index fd96b9ebb..1bc827721 100644 --- a/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - diff --git a/desktop_photo_search/fluent_ui/pubspec.yaml b/desktop_photo_search/fluent_ui/pubspec.yaml index ff8376876..79ab91752 100644 --- a/desktop_photo_search/fluent_ui/pubspec.yaml +++ b/desktop_photo_search/fluent_ui/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: built_collection: ^5.1.1 diff --git a/desktop_photo_search/fluent_ui/windows/CMakeLists.txt b/desktop_photo_search/fluent_ui/windows/CMakeLists.txt index da8f22282..a8aac9b6f 100644 --- a/desktop_photo_search/fluent_ui/windows/CMakeLists.txt +++ b/desktop_photo_search/fluent_ui/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "desktop_photo_search") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/desktop_photo_search/fluent_ui/windows/runner/flutter_window.cpp b/desktop_photo_search/fluent_ui/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/desktop_photo_search/fluent_ui/windows/runner/flutter_window.cpp +++ b/desktop_photo_search/fluent_ui/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/desktop_photo_search/material/.metadata b/desktop_photo_search/material/.metadata index 9abf315c6..931b79989 100644 --- a/desktop_photo_search/material/.metadata +++ b/desktop_photo_search/material/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # 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 1353fe674..b743d0dd9 100644 --- a/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj +++ b/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj @@ -27,8 +27,6 @@ 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 */; }; - 607F7642B31F44F3AD578E61 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48B98B27807D2343B35AE9 /* Pods_Runner.framework */; }; - 858500FF071902DE716422E4 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CFD5510F1A03ADF137537E /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -66,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; 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; }; + 33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "desktop_photo_search.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -78,16 +76,8 @@ 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 = ""; }; - 33ED0D15EA24A8D4CDE7BCE5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 63CFD5510F1A03ADF137537E /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 8A38BD6CE5B80E2DEA066CE6 /* 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 = ""; }; - B1D641A1AD20EA323F8534C4 /* 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 = ""; }; - B8D764BC512152E9A269F504 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CC443F350B7FA936F81C0834 /* 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 = ""; }; - ED48B98B27807D2343B35AE9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FED373E8439E63330E13C65D /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +85,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 858500FF071902DE716422E4 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +92,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 607F7642B31F44F3AD578E61 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +125,6 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 6A385BE468618AEC96F3EE22 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +172,9 @@ path = Runner; sourceTree = ""; }; - 6A385BE468618AEC96F3EE22 /* Pods */ = { - isa = PBXGroup; - children = ( - CC443F350B7FA936F81C0834 /* Pods-Runner.debug.xcconfig */, - B1D641A1AD20EA323F8534C4 /* Pods-Runner.release.xcconfig */, - 8A38BD6CE5B80E2DEA066CE6 /* Pods-Runner.profile.xcconfig */, - FED373E8439E63330E13C65D /* Pods-RunnerTests.debug.xcconfig */, - 33ED0D15EA24A8D4CDE7BCE5 /* Pods-RunnerTests.release.xcconfig */, - B8D764BC512152E9A269F504 /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - ED48B98B27807D2343B35AE9 /* Pods_Runner.framework */, - 63CFD5510F1A03ADF137537E /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +186,6 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 2B91E8D451BD39F3A8D34111 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +204,11 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C1B96D8C3CFD084847DE6D6E /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - DA3320F96B97CFF844C69D27 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -322,28 +290,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2B91E8D451BD39F3A8D34111 /* [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-RunnerTests-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; alwaysOutOfDate = 1; @@ -382,45 +328,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - C1B96D8C3CFD084847DE6D6E /* [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; - }; - DA3320F96B97CFF844C69D27 /* [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 */ @@ -472,7 +379,6 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FED373E8439E63330E13C65D /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -487,7 +393,6 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 33ED0D15EA24A8D4CDE7BCE5 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -502,7 +407,6 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B8D764BC512152E9A269F504 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata b/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc14c..1d526a16e 100644 --- a/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/desktop_photo_search/material/pubspec.yaml b/desktop_photo_search/material/pubspec.yaml index d18600db7..bdfe6e5c3 100644 --- a/desktop_photo_search/material/pubspec.yaml +++ b/desktop_photo_search/material/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: built_collection: ^5.1.1 diff --git a/desktop_photo_search/material/windows/CMakeLists.txt b/desktop_photo_search/material/windows/CMakeLists.txt index da8f22282..a8aac9b6f 100644 --- a/desktop_photo_search/material/windows/CMakeLists.txt +++ b/desktop_photo_search/material/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "desktop_photo_search") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/desktop_photo_search/material/windows/runner/flutter_window.cpp b/desktop_photo_search/material/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/desktop_photo_search/material/windows/runner/flutter_window.cpp +++ b/desktop_photo_search/material/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/experimental/context_menus/lib/modified_action_page.dart b/experimental/context_menus/lib/modified_action_page.dart index fd6e90cf4..2a2e506e1 100644 --- a/experimental/context_menus/lib/modified_action_page.dart +++ b/experimental/context_menus/lib/modified_action_page.dart @@ -77,7 +77,7 @@ class ModifiedActionPage extends StatelessWidget { buttonItems[copyButtonIndex]; buttonItems[copyButtonIndex] = copyButtonItem.copyWith( onPressed: () { - copyButtonItem.onPressed(); + copyButtonItem.onPressed!(); Navigator.of(context).push(_showDialog(context)); }, ); diff --git a/experimental/context_menus/pubspec.yaml b/experimental/context_menus/pubspec.yaml index c35c39d56..f969cf728 100644 --- a/experimental/context_menus/pubspec.yaml +++ b/experimental/context_menus/pubspec.yaml @@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/experimental/federated_plugin/federated_plugin/example/pubspec.yaml b/experimental/federated_plugin/federated_plugin/example/pubspec.yaml index 6b3f6508d..a89e836c5 100644 --- a/experimental/federated_plugin/federated_plugin/example/pubspec.yaml +++ b/experimental/federated_plugin/federated_plugin/example/pubspec.yaml @@ -4,7 +4,7 @@ description: Demonstrates how to use the federated_plugin plugin. publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/federated_plugin/federated_plugin/pubspec.yaml b/experimental/federated_plugin/federated_plugin/pubspec.yaml index 67d2a4ea4..9b915a16c 100644 --- a/experimental/federated_plugin/federated_plugin/pubspec.yaml +++ b/experimental/federated_plugin/federated_plugin/pubspec.yaml @@ -5,7 +5,7 @@ version: 0.0.1 publish_to: "none" environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/federated_plugin/federated_plugin_macos/pubspec.yaml b/experimental/federated_plugin/federated_plugin_macos/pubspec.yaml index 5d7ddc93e..580fc380f 100644 --- a/experimental/federated_plugin/federated_plugin_macos/pubspec.yaml +++ b/experimental/federated_plugin/federated_plugin_macos/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/federated_plugin/federated_plugin_platform_interface/pubspec.yaml b/experimental/federated_plugin/federated_plugin_platform_interface/pubspec.yaml index e2ba11d43..157c563e3 100644 --- a/experimental/federated_plugin/federated_plugin_platform_interface/pubspec.yaml +++ b/experimental/federated_plugin/federated_plugin_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/federated_plugin/federated_plugin_web/pubspec.yaml b/experimental/federated_plugin/federated_plugin_web/pubspec.yaml index 120447a10..b1b6ccdeb 100644 --- a/experimental/federated_plugin/federated_plugin_web/pubspec.yaml +++ b/experimental/federated_plugin/federated_plugin_web/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/federated_plugin/federated_plugin_windows/pubspec.yaml b/experimental/federated_plugin/federated_plugin_windows/pubspec.yaml index 54c6149b8..0e25ab72b 100644 --- a/experimental/federated_plugin/federated_plugin_windows/pubspec.yaml +++ b/experimental/federated_plugin/federated_plugin_windows/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/linting_tool/pubspec.yaml b/experimental/linting_tool/pubspec.yaml index a92ac97c2..ee5a7a931 100644 --- a/experimental/linting_tool/pubspec.yaml +++ b/experimental/linting_tool/pubspec.yaml @@ -6,7 +6,7 @@ version: 1.0.0+1 publish_to: "none" environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/material_3_demo/pubspec.yaml b/experimental/material_3_demo/pubspec.yaml index 04e134b8a..33a040c95 100644 --- a/experimental/material_3_demo/pubspec.yaml +++ b/experimental/material_3_demo/pubspec.yaml @@ -8,7 +8,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/experimental/pedometer/example/pubspec.yaml b/experimental/pedometer/example/pubspec.yaml index 069f00840..289e1e1d5 100644 --- a/experimental/pedometer/example/pubspec.yaml +++ b/experimental/pedometer/example/pubspec.yaml @@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/experimental/pedometer/lib/health_connect.dart b/experimental/pedometer/lib/health_connect.dart index e4f80f29c..3e93c2c09 100644 --- a/experimental/pedometer/lib/health_connect.dart +++ b/experimental/pedometer/lib/health_connect.dart @@ -53,8 +53,8 @@ class HealthConnectClient extends jni.JObject { static const HEALTH_CONNECT_CLIENT_TAG = r"""HealthConnectClient"""; static final _getPermissionController = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "HealthConnectClient__getPermissionController") .asFunction)>(); @@ -468,9 +468,9 @@ class HealthConnectClient extends jni.JObject { } static final _isAvailable1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("HealthConnectClient__isAvailable1") + ffi + .NativeFunction)>>( + "HealthConnectClient__isAvailable1") .asFunction)>(); /// from: static public boolean isAvailable(android.content.Context context) @@ -481,9 +481,9 @@ class HealthConnectClient extends jni.JObject { } static final _getOrCreate1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("HealthConnectClient__getOrCreate1") + ffi + .NativeFunction)>>( + "HealthConnectClient__getOrCreate1") .asFunction)>(); /// from: static public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context) @@ -593,8 +593,8 @@ class PermissionController extends jni.JObject { } static final _createRequestPermissionResultContract = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "PermissionController__createRequestPermissionResultContract") .asFunction)>(); @@ -759,9 +759,9 @@ class StepsRecord extends jni.JObject { } static final _getCount = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__getCount") + ffi + .NativeFunction)>>( + "StepsRecord__getCount") .asFunction)>(); /// from: public final long getCount() @@ -770,9 +770,9 @@ class StepsRecord extends jni.JObject { } static final _getStartTime = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__getStartTime") + ffi + .NativeFunction)>>( + "StepsRecord__getStartTime") .asFunction)>(); /// from: public java.time.Instant getStartTime() @@ -782,9 +782,9 @@ class StepsRecord extends jni.JObject { } static final _getStartZoneOffset = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__getStartZoneOffset") + ffi + .NativeFunction)>>( + "StepsRecord__getStartZoneOffset") .asFunction)>(); /// from: public java.time.ZoneOffset getStartZoneOffset() @@ -795,9 +795,9 @@ class StepsRecord extends jni.JObject { } static final _getEndTime = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__getEndTime") + ffi + .NativeFunction)>>( + "StepsRecord__getEndTime") .asFunction)>(); /// from: public java.time.Instant getEndTime() @@ -807,9 +807,9 @@ class StepsRecord extends jni.JObject { } static final _getEndZoneOffset = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__getEndZoneOffset") + ffi + .NativeFunction)>>( + "StepsRecord__getEndZoneOffset") .asFunction)>(); /// from: public java.time.ZoneOffset getEndZoneOffset() @@ -819,9 +819,9 @@ class StepsRecord extends jni.JObject { } static final _getMetadata = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__getMetadata") + ffi + .NativeFunction)>>( + "StepsRecord__getMetadata") .asFunction)>(); /// from: public androidx.health.connect.client.records.metadata.Metadata getMetadata() @@ -846,9 +846,9 @@ class StepsRecord extends jni.JObject { } static final _hashCode1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("StepsRecord__hashCode1") + ffi + .NativeFunction)>>( + "StepsRecord__hashCode1") .asFunction)>(); /// from: public int hashCode() @@ -1002,9 +1002,9 @@ class TimeRangeFilter_Companion extends jni.JObject { } static final _ctor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("TimeRangeFilter_Companion__ctor") + ffi + .NativeFunction)>>( + "TimeRangeFilter_Companion__ctor") .asFunction)>(); /// from: public void (kotlin.jvm.internal.DefaultConstructorMarker defaultConstructorMarker) @@ -1144,9 +1144,9 @@ class TimeRangeFilter extends jni.JObject { } static final _hashCode1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("TimeRangeFilter__hashCode1") + ffi + .NativeFunction)>>( + "TimeRangeFilter__hashCode1") .asFunction)>(); /// from: public int hashCode() @@ -1201,9 +1201,9 @@ class TimeRangeFilter extends jni.JObject { } static final _before = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("TimeRangeFilter__before") + ffi + .NativeFunction)>>( + "TimeRangeFilter__before") .asFunction)>(); /// from: static public final androidx.health.connect.client.time.TimeRangeFilter before(java.time.Instant instant) @@ -1216,9 +1216,9 @@ class TimeRangeFilter extends jni.JObject { } static final _before1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("TimeRangeFilter__before1") + ffi + .NativeFunction)>>( + "TimeRangeFilter__before1") .asFunction)>(); /// from: static public final androidx.health.connect.client.time.TimeRangeFilter before(java.time.LocalDateTime localDateTime) @@ -1231,9 +1231,9 @@ class TimeRangeFilter extends jni.JObject { } static final _after = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("TimeRangeFilter__after") + ffi + .NativeFunction)>>( + "TimeRangeFilter__after") .asFunction)>(); /// from: static public final androidx.health.connect.client.time.TimeRangeFilter after(java.time.Instant instant) @@ -1246,9 +1246,9 @@ class TimeRangeFilter extends jni.JObject { } static final _after1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("TimeRangeFilter__after1") + ffi + .NativeFunction)>>( + "TimeRangeFilter__after1") .asFunction)>(); /// from: static public final androidx.health.connect.client.time.TimeRangeFilter after(java.time.LocalDateTime localDateTime) @@ -1642,9 +1642,9 @@ class Context extends jni.JObject { } static final _getAssets = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getAssets") + ffi + .NativeFunction)>>( + "Context__getAssets") .asFunction)>(); /// from: public abstract android.content.res.AssetManager getAssets() @@ -1654,9 +1654,9 @@ class Context extends jni.JObject { } static final _getResources = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getResources") + ffi + .NativeFunction)>>( + "Context__getResources") .asFunction)>(); /// from: public abstract android.content.res.Resources getResources() @@ -1666,9 +1666,9 @@ class Context extends jni.JObject { } static final _getPackageManager = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getPackageManager") + ffi + .NativeFunction)>>( + "Context__getPackageManager") .asFunction)>(); /// from: public abstract android.content.pm.PackageManager getPackageManager() @@ -1679,9 +1679,9 @@ class Context extends jni.JObject { } static final _getContentResolver = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getContentResolver") + ffi + .NativeFunction)>>( + "Context__getContentResolver") .asFunction)>(); /// from: public abstract android.content.ContentResolver getContentResolver() @@ -1692,9 +1692,9 @@ class Context extends jni.JObject { } static final _getMainLooper = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getMainLooper") + ffi + .NativeFunction)>>( + "Context__getMainLooper") .asFunction)>(); /// from: public abstract android.os.Looper getMainLooper() @@ -1704,9 +1704,9 @@ class Context extends jni.JObject { } static final _getMainExecutor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getMainExecutor") + ffi + .NativeFunction)>>( + "Context__getMainExecutor") .asFunction)>(); /// from: public java.util.concurrent.Executor getMainExecutor() @@ -1716,9 +1716,9 @@ class Context extends jni.JObject { } static final _getApplicationContext = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getApplicationContext") + ffi + .NativeFunction)>>( + "Context__getApplicationContext") .asFunction)>(); /// from: public abstract android.content.Context getApplicationContext() @@ -1865,9 +1865,9 @@ class Context extends jni.JObject { } static final _getTheme = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getTheme") + ffi + .NativeFunction)>>( + "Context__getTheme") .asFunction)>(); /// from: public abstract android.content.res.Resources$Theme getTheme() @@ -1958,9 +1958,9 @@ class Context extends jni.JObject { } static final _getClassLoader = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getClassLoader") + ffi + .NativeFunction)>>( + "Context__getClassLoader") .asFunction)>(); /// from: public abstract java.lang.ClassLoader getClassLoader() @@ -1970,9 +1970,9 @@ class Context extends jni.JObject { } static final _getPackageName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getPackageName") + ffi + .NativeFunction)>>( + "Context__getPackageName") .asFunction)>(); /// from: public abstract java.lang.String getPackageName() @@ -1982,9 +1982,9 @@ class Context extends jni.JObject { } static final _getOpPackageName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getOpPackageName") + ffi + .NativeFunction)>>( + "Context__getOpPackageName") .asFunction)>(); /// from: public java.lang.String getOpPackageName() @@ -1994,9 +1994,9 @@ class Context extends jni.JObject { } static final _getAttributionTag = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getAttributionTag") + ffi + .NativeFunction)>>( + "Context__getAttributionTag") .asFunction)>(); /// from: public java.lang.String getAttributionTag() @@ -2007,9 +2007,9 @@ class Context extends jni.JObject { } static final _getAttributionSource = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getAttributionSource") + ffi + .NativeFunction)>>( + "Context__getAttributionSource") .asFunction)>(); /// from: public android.content.AttributionSource getAttributionSource() @@ -2020,9 +2020,9 @@ class Context extends jni.JObject { } static final _getParams = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getParams") + ffi + .NativeFunction)>>( + "Context__getParams") .asFunction)>(); /// from: public android.content.ContextParams getParams() @@ -2032,9 +2032,9 @@ class Context extends jni.JObject { } static final _getApplicationInfo = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getApplicationInfo") + ffi + .NativeFunction)>>( + "Context__getApplicationInfo") .asFunction)>(); /// from: public abstract android.content.pm.ApplicationInfo getApplicationInfo() @@ -2045,9 +2045,9 @@ class Context extends jni.JObject { } static final _getPackageResourcePath = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getPackageResourcePath") + ffi + .NativeFunction)>>( + "Context__getPackageResourcePath") .asFunction)>(); /// from: public abstract java.lang.String getPackageResourcePath() @@ -2058,9 +2058,9 @@ class Context extends jni.JObject { } static final _getPackageCodePath = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getPackageCodePath") + ffi + .NativeFunction)>>( + "Context__getPackageCodePath") .asFunction)>(); /// from: public abstract java.lang.String getPackageCodePath() @@ -2193,9 +2193,9 @@ class Context extends jni.JObject { } static final _getDataDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getDataDir") + ffi + .NativeFunction)>>( + "Context__getDataDir") .asFunction)>(); /// from: public abstract java.io.File getDataDir() @@ -2205,9 +2205,9 @@ class Context extends jni.JObject { } static final _getFilesDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getFilesDir") + ffi + .NativeFunction)>>( + "Context__getFilesDir") .asFunction)>(); /// from: public abstract java.io.File getFilesDir() @@ -2217,9 +2217,9 @@ class Context extends jni.JObject { } static final _getNoBackupFilesDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getNoBackupFilesDir") + ffi + .NativeFunction)>>( + "Context__getNoBackupFilesDir") .asFunction)>(); /// from: public abstract java.io.File getNoBackupFilesDir() @@ -2264,9 +2264,9 @@ class Context extends jni.JObject { } static final _getObbDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getObbDir") + ffi + .NativeFunction)>>( + "Context__getObbDir") .asFunction)>(); /// from: public abstract java.io.File getObbDir() @@ -2276,9 +2276,9 @@ class Context extends jni.JObject { } static final _getObbDirs = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getObbDirs") + ffi + .NativeFunction)>>( + "Context__getObbDirs") .asFunction)>(); /// from: public abstract java.io.File[] getObbDirs() @@ -2289,9 +2289,9 @@ class Context extends jni.JObject { } static final _getCacheDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getCacheDir") + ffi + .NativeFunction)>>( + "Context__getCacheDir") .asFunction)>(); /// from: public abstract java.io.File getCacheDir() @@ -2301,9 +2301,9 @@ class Context extends jni.JObject { } static final _getCodeCacheDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getCodeCacheDir") + ffi + .NativeFunction)>>( + "Context__getCodeCacheDir") .asFunction)>(); /// from: public abstract java.io.File getCodeCacheDir() @@ -2313,9 +2313,9 @@ class Context extends jni.JObject { } static final _getExternalCacheDir = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getExternalCacheDir") + ffi + .NativeFunction)>>( + "Context__getExternalCacheDir") .asFunction)>(); /// from: public abstract java.io.File getExternalCacheDir() @@ -2326,9 +2326,9 @@ class Context extends jni.JObject { } static final _getExternalCacheDirs = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getExternalCacheDirs") + ffi + .NativeFunction)>>( + "Context__getExternalCacheDirs") .asFunction)>(); /// from: public abstract java.io.File[] getExternalCacheDirs() @@ -2339,9 +2339,9 @@ class Context extends jni.JObject { } static final _getExternalMediaDirs = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getExternalMediaDirs") + ffi + .NativeFunction)>>( + "Context__getExternalMediaDirs") .asFunction)>(); /// from: public abstract java.io.File[] getExternalMediaDirs() @@ -2352,9 +2352,9 @@ class Context extends jni.JObject { } static final _fileList = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__fileList") + ffi + .NativeFunction)>>( + "Context__fileList") .asFunction)>(); /// from: public abstract java.lang.String[] fileList() @@ -2486,9 +2486,9 @@ class Context extends jni.JObject { } static final _databaseList = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__databaseList") + ffi + .NativeFunction)>>( + "Context__databaseList") .asFunction)>(); /// from: public abstract java.lang.String[] databaseList() @@ -2499,9 +2499,9 @@ class Context extends jni.JObject { } static final _getWallpaper = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getWallpaper") + ffi + .NativeFunction)>>( + "Context__getWallpaper") .asFunction)>(); /// from: public abstract android.graphics.drawable.Drawable getWallpaper() @@ -2511,9 +2511,9 @@ class Context extends jni.JObject { } static final _peekWallpaper = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__peekWallpaper") + ffi + .NativeFunction)>>( + "Context__peekWallpaper") .asFunction)>(); /// from: public abstract android.graphics.drawable.Drawable peekWallpaper() @@ -2523,8 +2523,8 @@ class Context extends jni.JObject { } static final _getWallpaperDesiredMinimumWidth = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Context__getWallpaperDesiredMinimumWidth") .asFunction)>(); @@ -2534,8 +2534,8 @@ class Context extends jni.JObject { } static final _getWallpaperDesiredMinimumHeight = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Context__getWallpaperDesiredMinimumHeight") .asFunction)>(); @@ -2575,9 +2575,9 @@ class Context extends jni.JObject { } static final _clearWallpaper = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__clearWallpaper") + ffi + .NativeFunction)>>( + "Context__clearWallpaper") .asFunction)>(); /// from: public abstract void clearWallpaper() @@ -4154,8 +4154,8 @@ class Context extends jni.JObject { } static final _createDeviceProtectedStorageContext = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Context__createDeviceProtectedStorageContext") .asFunction)>(); @@ -4167,9 +4167,9 @@ class Context extends jni.JObject { } static final _getDisplay = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__getDisplay") + ffi + .NativeFunction)>>( + "Context__getDisplay") .asFunction)>(); /// from: public android.view.Display getDisplay() @@ -4179,9 +4179,9 @@ class Context extends jni.JObject { } static final _isRestricted = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__isRestricted") + ffi + .NativeFunction)>>( + "Context__isRestricted") .asFunction)>(); /// from: public boolean isRestricted() @@ -4190,9 +4190,9 @@ class Context extends jni.JObject { } static final _isDeviceProtectedStorage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__isDeviceProtectedStorage") + ffi + .NativeFunction)>>( + "Context__isDeviceProtectedStorage") .asFunction)>(); /// from: public abstract boolean isDeviceProtectedStorage() @@ -4201,9 +4201,9 @@ class Context extends jni.JObject { } static final _isUiContext = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Context__isUiContext") + ffi + .NativeFunction)>>( + "Context__isUiContext") .asFunction)>(); /// from: public boolean isUiContext() @@ -5368,8 +5368,9 @@ class Intent extends jni.JObject { } static final _ctor1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Intent__ctor1") + ffi + .NativeFunction)>>( + "Intent__ctor1") .asFunction)>(); /// from: public void (android.content.Intent intent) @@ -5381,8 +5382,9 @@ class Intent extends jni.JObject { } static final _ctor2 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Intent__ctor2") + ffi + .NativeFunction)>>( + "Intent__ctor2") .asFunction)>(); /// from: public void (java.lang.String string) @@ -5492,8 +5494,9 @@ class Intent extends jni.JObject { } static final _clone = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Intent__clone") + ffi + .NativeFunction)>>( + "Intent__clone") .asFunction)>(); /// from: public java.lang.Object clone() @@ -5503,9 +5506,9 @@ class Intent extends jni.JObject { } static final _cloneFilter = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__cloneFilter") + ffi + .NativeFunction)>>( + "Intent__cloneFilter") .asFunction)>(); /// from: public android.content.Intent cloneFilter() @@ -5515,9 +5518,9 @@ class Intent extends jni.JObject { } static final _makeMainActivity = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__makeMainActivity") + ffi + .NativeFunction)>>( + "Intent__makeMainActivity") .asFunction)>(); /// from: static public android.content.Intent makeMainActivity(android.content.ComponentName componentName) @@ -5548,9 +5551,9 @@ class Intent extends jni.JObject { } static final _makeRestartActivityTask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__makeRestartActivityTask") + ffi + .NativeFunction)>>( + "Intent__makeRestartActivityTask") .asFunction)>(); /// from: static public android.content.Intent makeRestartActivityTask(android.content.ComponentName componentName) @@ -5563,9 +5566,9 @@ class Intent extends jni.JObject { } static final _getIntent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getIntent") + ffi + .NativeFunction)>>( + "Intent__getIntent") .asFunction)>(); /// from: static public android.content.Intent getIntent(java.lang.String string) @@ -5592,9 +5595,9 @@ class Intent extends jni.JObject { } static final _getIntentOld = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getIntentOld") + ffi + .NativeFunction)>>( + "Intent__getIntentOld") .asFunction)>(); /// from: static public android.content.Intent getIntentOld(java.lang.String string) @@ -5606,9 +5609,9 @@ class Intent extends jni.JObject { } static final _getAction = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getAction") + ffi + .NativeFunction)>>( + "Intent__getAction") .asFunction)>(); /// from: public java.lang.String getAction() @@ -5618,8 +5621,9 @@ class Intent extends jni.JObject { } static final _getData = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Intent__getData") + ffi + .NativeFunction)>>( + "Intent__getData") .asFunction)>(); /// from: public android.net.Uri getData() @@ -5629,9 +5633,9 @@ class Intent extends jni.JObject { } static final _getDataString = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getDataString") + ffi + .NativeFunction)>>( + "Intent__getDataString") .asFunction)>(); /// from: public java.lang.String getDataString() @@ -5641,9 +5645,9 @@ class Intent extends jni.JObject { } static final _getScheme = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getScheme") + ffi + .NativeFunction)>>( + "Intent__getScheme") .asFunction)>(); /// from: public java.lang.String getScheme() @@ -5653,8 +5657,9 @@ class Intent extends jni.JObject { } static final _getType = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Intent__getType") + ffi + .NativeFunction)>>( + "Intent__getType") .asFunction)>(); /// from: public java.lang.String getType() @@ -5715,9 +5720,9 @@ class Intent extends jni.JObject { } static final _getIdentifier = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getIdentifier") + ffi + .NativeFunction)>>( + "Intent__getIdentifier") .asFunction)>(); /// from: public java.lang.String getIdentifier() @@ -5742,9 +5747,9 @@ class Intent extends jni.JObject { } static final _getCategories = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getCategories") + ffi + .NativeFunction)>>( + "Intent__getCategories") .asFunction)>(); /// from: public java.util.Set getCategories() @@ -5755,9 +5760,9 @@ class Intent extends jni.JObject { } static final _getSelector = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getSelector") + ffi + .NativeFunction)>>( + "Intent__getSelector") .asFunction)>(); /// from: public android.content.Intent getSelector() @@ -5767,9 +5772,9 @@ class Intent extends jni.JObject { } static final _getClipData = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getClipData") + ffi + .NativeFunction)>>( + "Intent__getClipData") .asFunction)>(); /// from: public android.content.ClipData getClipData() @@ -5809,9 +5814,9 @@ class Intent extends jni.JObject { } static final _hasFileDescriptors = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__hasFileDescriptors") + ffi + .NativeFunction)>>( + "Intent__hasFileDescriptors") .asFunction)>(); /// from: public boolean hasFileDescriptors() @@ -6378,9 +6383,9 @@ class Intent extends jni.JObject { } static final _getExtras = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getExtras") + ffi + .NativeFunction)>>( + "Intent__getExtras") .asFunction)>(); /// from: public android.os.Bundle getExtras() @@ -6390,9 +6395,9 @@ class Intent extends jni.JObject { } static final _getFlags = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getFlags") + ffi + .NativeFunction)>>( + "Intent__getFlags") .asFunction)>(); /// from: public int getFlags() @@ -6401,9 +6406,9 @@ class Intent extends jni.JObject { } static final _getPackage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getPackage") + ffi + .NativeFunction)>>( + "Intent__getPackage") .asFunction)>(); /// from: public java.lang.String getPackage() @@ -6413,9 +6418,9 @@ class Intent extends jni.JObject { } static final _getComponent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getComponent") + ffi + .NativeFunction)>>( + "Intent__getComponent") .asFunction)>(); /// from: public android.content.ComponentName getComponent() @@ -6425,9 +6430,9 @@ class Intent extends jni.JObject { } static final _getSourceBounds = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__getSourceBounds") + ffi + .NativeFunction)>>( + "Intent__getSourceBounds") .asFunction)>(); /// from: public android.graphics.Rect getSourceBounds() @@ -7491,9 +7496,9 @@ class Intent extends jni.JObject { } static final _filterHashCode = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__filterHashCode") + ffi + .NativeFunction)>>( + "Intent__filterHashCode") .asFunction)>(); /// from: public int filterHashCode() @@ -7502,9 +7507,9 @@ class Intent extends jni.JObject { } static final _toString1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__toString1") + ffi + .NativeFunction)>>( + "Intent__toString1") .asFunction)>(); /// from: public java.lang.String toString() @@ -7514,8 +7519,9 @@ class Intent extends jni.JObject { } static final _toURI = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Intent__toURI") + ffi + .NativeFunction)>>( + "Intent__toURI") .asFunction)>(); /// from: public java.lang.String toURI() @@ -7539,9 +7545,9 @@ class Intent extends jni.JObject { } static final _describeContents = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__describeContents") + ffi + .NativeFunction)>>( + "Intent__describeContents") .asFunction)>(); /// from: public int describeContents() @@ -7603,9 +7609,9 @@ class Intent extends jni.JObject { } static final _normalizeMimeType = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Intent__normalizeMimeType") + ffi + .NativeFunction)>>( + "Intent__normalizeMimeType") .asFunction)>(); /// from: static public java.lang.String normalizeMimeType(java.lang.String string) @@ -7700,9 +7706,9 @@ class Activity extends jni.JObject { } static final _getIntent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getIntent") + ffi + .NativeFunction)>>( + "Activity__getIntent") .asFunction)>(); /// from: public android.content.Intent getIntent() @@ -7746,9 +7752,9 @@ class Activity extends jni.JObject { } static final _getApplication = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getApplication") + ffi + .NativeFunction)>>( + "Activity__getApplication") .asFunction)>(); /// from: public final android.app.Application getApplication() @@ -7758,9 +7764,9 @@ class Activity extends jni.JObject { } static final _isChild = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isChild") + ffi + .NativeFunction)>>( + "Activity__isChild") .asFunction)>(); /// from: public final boolean isChild() @@ -7769,9 +7775,9 @@ class Activity extends jni.JObject { } static final _getParent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getParent") + ffi + .NativeFunction)>>( + "Activity__getParent") .asFunction)>(); /// from: public final android.app.Activity getParent() @@ -7781,9 +7787,9 @@ class Activity extends jni.JObject { } static final _getWindowManager = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getWindowManager") + ffi + .NativeFunction)>>( + "Activity__getWindowManager") .asFunction)>(); /// from: public android.view.WindowManager getWindowManager() @@ -7793,9 +7799,9 @@ class Activity extends jni.JObject { } static final _getWindow = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getWindow") + ffi + .NativeFunction)>>( + "Activity__getWindow") .asFunction)>(); /// from: public android.view.Window getWindow() @@ -7805,9 +7811,9 @@ class Activity extends jni.JObject { } static final _getLoaderManager = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getLoaderManager") + ffi + .NativeFunction)>>( + "Activity__getLoaderManager") .asFunction)>(); /// from: public android.app.LoaderManager getLoaderManager() @@ -7817,9 +7823,9 @@ class Activity extends jni.JObject { } static final _getCurrentFocus = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getCurrentFocus") + ffi + .NativeFunction)>>( + "Activity__getCurrentFocus") .asFunction)>(); /// from: public android.view.View getCurrentFocus() @@ -7930,9 +7936,9 @@ class Activity extends jni.JObject { } static final _getSplashScreen = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getSplashScreen") + ffi + .NativeFunction)>>( + "Activity__getSplashScreen") .asFunction)>(); /// from: public final android.window.SplashScreen getSplashScreen() @@ -8031,9 +8037,9 @@ class Activity extends jni.JObject { } static final _onStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onStart") + ffi + .NativeFunction)>>( + "Activity__onStart") .asFunction)>(); /// from: protected void onStart() @@ -8042,9 +8048,9 @@ class Activity extends jni.JObject { } static final _onRestart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onRestart") + ffi + .NativeFunction)>>( + "Activity__onRestart") .asFunction)>(); /// from: protected void onRestart() @@ -8053,9 +8059,9 @@ class Activity extends jni.JObject { } static final _onStateNotSaved = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onStateNotSaved") + ffi + .NativeFunction)>>( + "Activity__onStateNotSaved") .asFunction)>(); /// from: public void onStateNotSaved() @@ -8064,9 +8070,9 @@ class Activity extends jni.JObject { } static final _onResume = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onResume") + ffi + .NativeFunction)>>( + "Activity__onResume") .asFunction)>(); /// from: protected void onResume() @@ -8075,9 +8081,9 @@ class Activity extends jni.JObject { } static final _onPostResume = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onPostResume") + ffi + .NativeFunction)>>( + "Activity__onPostResume") .asFunction)>(); /// from: protected void onPostResume() @@ -8099,9 +8105,9 @@ class Activity extends jni.JObject { } static final _isVoiceInteraction = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isVoiceInteraction") + ffi + .NativeFunction)>>( + "Activity__isVoiceInteraction") .asFunction)>(); /// from: public boolean isVoiceInteraction() @@ -8110,9 +8116,9 @@ class Activity extends jni.JObject { } static final _isVoiceInteractionRoot = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isVoiceInteractionRoot") + ffi + .NativeFunction)>>( + "Activity__isVoiceInteractionRoot") .asFunction)>(); /// from: public boolean isVoiceInteractionRoot() @@ -8121,9 +8127,9 @@ class Activity extends jni.JObject { } static final _getVoiceInteractor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getVoiceInteractor") + ffi + .NativeFunction)>>( + "Activity__getVoiceInteractor") .asFunction)>(); /// from: public android.app.VoiceInteractor getVoiceInteractor() @@ -8134,8 +8140,8 @@ class Activity extends jni.JObject { } static final _isLocalVoiceInteractionSupported = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__isLocalVoiceInteractionSupported") .asFunction)>(); @@ -8161,8 +8167,8 @@ class Activity extends jni.JObject { } static final _onLocalVoiceInteractionStarted = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__onLocalVoiceInteractionStarted") .asFunction)>(); @@ -8172,8 +8178,8 @@ class Activity extends jni.JObject { } static final _onLocalVoiceInteractionStopped = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__onLocalVoiceInteractionStopped") .asFunction)>(); @@ -8183,8 +8189,8 @@ class Activity extends jni.JObject { } static final _stopLocalVoiceInteraction = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__stopLocalVoiceInteraction") .asFunction)>(); @@ -8244,9 +8250,9 @@ class Activity extends jni.JObject { } static final _onPause = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onPause") + ffi + .NativeFunction)>>( + "Activity__onPause") .asFunction)>(); /// from: protected void onPause() @@ -8255,9 +8261,9 @@ class Activity extends jni.JObject { } static final _onUserLeaveHint = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onUserLeaveHint") + ffi + .NativeFunction)>>( + "Activity__onUserLeaveHint") .asFunction)>(); /// from: protected void onUserLeaveHint() @@ -8285,9 +8291,9 @@ class Activity extends jni.JObject { } static final _onCreateDescription = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onCreateDescription") + ffi + .NativeFunction)>>( + "Activity__onCreateDescription") .asFunction)>(); /// from: public java.lang.CharSequence onCreateDescription() @@ -8376,8 +8382,8 @@ class Activity extends jni.JObject { } static final _requestShowKeyboardShortcuts = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__requestShowKeyboardShortcuts") .asFunction)>(); @@ -8387,8 +8393,8 @@ class Activity extends jni.JObject { } static final _dismissKeyboardShortcutsHelper = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__dismissKeyboardShortcutsHelper") .asFunction)>(); @@ -8435,9 +8441,9 @@ class Activity extends jni.JObject { } static final _onStop = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onStop") + ffi + .NativeFunction)>>( + "Activity__onStop") .asFunction)>(); /// from: protected void onStop() @@ -8446,9 +8452,9 @@ class Activity extends jni.JObject { } static final _onDestroy = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onDestroy") + ffi + .NativeFunction)>>( + "Activity__onDestroy") .asFunction)>(); /// from: protected void onDestroy() @@ -8457,9 +8463,9 @@ class Activity extends jni.JObject { } static final _reportFullyDrawn = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__reportFullyDrawn") + ffi + .NativeFunction)>>( + "Activity__reportFullyDrawn") .asFunction)>(); /// from: public void reportFullyDrawn() @@ -8499,9 +8505,9 @@ class Activity extends jni.JObject { } static final _isInMultiWindowMode = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isInMultiWindowMode") + ffi + .NativeFunction)>>( + "Activity__isInMultiWindowMode") .asFunction)>(); /// from: public boolean isInMultiWindowMode() @@ -8560,9 +8566,9 @@ class Activity extends jni.JObject { } static final _isInPictureInPictureMode = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isInPictureInPictureMode") + ffi + .NativeFunction)>>( + "Activity__isInPictureInPictureMode") .asFunction)>(); /// from: public boolean isInPictureInPictureMode() @@ -8571,8 +8577,8 @@ class Activity extends jni.JObject { } static final _enterPictureInPictureMode = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__enterPictureInPictureMode") .asFunction)>(); @@ -8618,8 +8624,8 @@ class Activity extends jni.JObject { } static final _getMaxNumPictureInPictureActions = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__getMaxNumPictureInPictureActions") .asFunction)>(); @@ -8629,8 +8635,8 @@ class Activity extends jni.JObject { } static final _onPictureInPictureRequested = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__onPictureInPictureRequested") .asFunction)>(); @@ -8653,9 +8659,9 @@ class Activity extends jni.JObject { } static final _shouldDockBigOverlays = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__shouldDockBigOverlays") + ffi + .NativeFunction)>>( + "Activity__shouldDockBigOverlays") .asFunction)>(); /// from: public boolean shouldDockBigOverlays() @@ -8679,8 +8685,8 @@ class Activity extends jni.JObject { } static final _getChangingConfigurations = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__getChangingConfigurations") .asFunction)>(); @@ -8690,8 +8696,8 @@ class Activity extends jni.JObject { } static final _getLastNonConfigurationInstance = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__getLastNonConfigurationInstance") .asFunction)>(); @@ -8703,8 +8709,8 @@ class Activity extends jni.JObject { } static final _onRetainNonConfigurationInstance = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__onRetainNonConfigurationInstance") .asFunction)>(); @@ -8716,9 +8722,9 @@ class Activity extends jni.JObject { } static final _onLowMemory = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onLowMemory") + ffi + .NativeFunction)>>( + "Activity__onLowMemory") .asFunction)>(); /// from: public void onLowMemory() @@ -8740,9 +8746,9 @@ class Activity extends jni.JObject { } static final _getFragmentManager = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getFragmentManager") + ffi + .NativeFunction)>>( + "Activity__getFragmentManager") .asFunction)>(); /// from: public android.app.FragmentManager getFragmentManager() @@ -8865,9 +8871,9 @@ class Activity extends jni.JObject { } static final _getActionBar = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getActionBar") + ffi + .NativeFunction)>>( + "Activity__getActionBar") .asFunction)>(); /// from: public android.app.ActionBar getActionBar() @@ -8958,8 +8964,8 @@ class Activity extends jni.JObject { } static final _getContentTransitionManager = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__getContentTransitionManager") .asFunction)>(); @@ -8988,9 +8994,9 @@ class Activity extends jni.JObject { } static final _getContentScene = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getContentScene") + ffi + .NativeFunction)>>( + "Activity__getContentScene") .asFunction)>(); /// from: public android.transition.Scene getContentScene() @@ -9091,9 +9097,9 @@ class Activity extends jni.JObject { } static final _onBackPressed = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onBackPressed") + ffi + .NativeFunction)>>( + "Activity__onBackPressed") .asFunction)>(); /// from: public void onBackPressed() @@ -9163,9 +9169,9 @@ class Activity extends jni.JObject { } static final _onUserInteraction = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onUserInteraction") + ffi + .NativeFunction)>>( + "Activity__onUserInteraction") .asFunction)>(); /// from: public void onUserInteraction() @@ -9191,9 +9197,9 @@ class Activity extends jni.JObject { } static final _onContentChanged = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onContentChanged") + ffi + .NativeFunction)>>( + "Activity__onContentChanged") .asFunction)>(); /// from: public void onContentChanged() @@ -9215,9 +9221,9 @@ class Activity extends jni.JObject { } static final _onAttachedToWindow = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onAttachedToWindow") + ffi + .NativeFunction)>>( + "Activity__onAttachedToWindow") .asFunction)>(); /// from: public void onAttachedToWindow() @@ -9226,9 +9232,9 @@ class Activity extends jni.JObject { } static final _onDetachedFromWindow = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onDetachedFromWindow") + ffi + .NativeFunction)>>( + "Activity__onDetachedFromWindow") .asFunction)>(); /// from: public void onDetachedFromWindow() @@ -9237,9 +9243,9 @@ class Activity extends jni.JObject { } static final _hasWindowFocus = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__hasWindowFocus") + ffi + .NativeFunction)>>( + "Activity__hasWindowFocus") .asFunction)>(); /// from: public boolean hasWindowFocus() @@ -9443,9 +9449,9 @@ class Activity extends jni.JObject { } static final _invalidateOptionsMenu = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__invalidateOptionsMenu") + ffi + .NativeFunction)>>( + "Activity__invalidateOptionsMenu") .asFunction)>(); /// from: public void invalidateOptionsMenu() @@ -9499,9 +9505,9 @@ class Activity extends jni.JObject { } static final _onNavigateUp = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onNavigateUp") + ffi + .NativeFunction)>>( + "Activity__onNavigateUp") .asFunction)>(); /// from: public boolean onNavigateUp() @@ -9574,9 +9580,9 @@ class Activity extends jni.JObject { } static final _openOptionsMenu = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__openOptionsMenu") + ffi + .NativeFunction)>>( + "Activity__openOptionsMenu") .asFunction)>(); /// from: public void openOptionsMenu() @@ -9585,9 +9591,9 @@ class Activity extends jni.JObject { } static final _closeOptionsMenu = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__closeOptionsMenu") + ffi + .NativeFunction)>>( + "Activity__closeOptionsMenu") .asFunction)>(); /// from: public void closeOptionsMenu() @@ -9663,9 +9669,9 @@ class Activity extends jni.JObject { } static final _closeContextMenu = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__closeContextMenu") + ffi + .NativeFunction)>>( + "Activity__closeContextMenu") .asFunction)>(); /// from: public void closeContextMenu() @@ -9844,9 +9850,9 @@ class Activity extends jni.JObject { } static final _onSearchRequested1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onSearchRequested1") + ffi + .NativeFunction)>>( + "Activity__onSearchRequested1") .asFunction)>(); /// from: public boolean onSearchRequested() @@ -9855,9 +9861,9 @@ class Activity extends jni.JObject { } static final _getSearchEvent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getSearchEvent") + ffi + .NativeFunction)>>( + "Activity__getSearchEvent") .asFunction)>(); /// from: public final android.view.SearchEvent getSearchEvent() @@ -9996,9 +10002,9 @@ class Activity extends jni.JObject { } static final _getLayoutInflater = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getLayoutInflater") + ffi + .NativeFunction)>>( + "Activity__getLayoutInflater") .asFunction)>(); /// from: public android.view.LayoutInflater getLayoutInflater() @@ -10009,9 +10015,9 @@ class Activity extends jni.JObject { } static final _getMenuInflater = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getMenuInflater") + ffi + .NativeFunction)>>( + "Activity__getMenuInflater") .asFunction)>(); /// from: public android.view.MenuInflater getMenuInflater() @@ -10150,8 +10156,8 @@ class Activity extends jni.JObject { } static final _isActivityTransitionRunning = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__isActivityTransitionRunning") .asFunction)>(); @@ -10665,9 +10671,9 @@ class Activity extends jni.JObject { } static final _getReferrer = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getReferrer") + ffi + .NativeFunction)>>( + "Activity__getReferrer") .asFunction)>(); /// from: public android.net.Uri getReferrer() @@ -10677,9 +10683,9 @@ class Activity extends jni.JObject { } static final _onProvideReferrer = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onProvideReferrer") + ffi + .NativeFunction)>>( + "Activity__onProvideReferrer") .asFunction)>(); /// from: public android.net.Uri onProvideReferrer() @@ -10690,9 +10696,9 @@ class Activity extends jni.JObject { } static final _getCallingPackage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getCallingPackage") + ffi + .NativeFunction)>>( + "Activity__getCallingPackage") .asFunction)>(); /// from: public java.lang.String getCallingPackage() @@ -10703,9 +10709,9 @@ class Activity extends jni.JObject { } static final _getCallingActivity = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getCallingActivity") + ffi + .NativeFunction)>>( + "Activity__getCallingActivity") .asFunction)>(); /// from: public android.content.ComponentName getCallingActivity() @@ -10729,9 +10735,9 @@ class Activity extends jni.JObject { } static final _isFinishing = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isFinishing") + ffi + .NativeFunction)>>( + "Activity__isFinishing") .asFunction)>(); /// from: public boolean isFinishing() @@ -10740,9 +10746,9 @@ class Activity extends jni.JObject { } static final _isDestroyed = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isDestroyed") + ffi + .NativeFunction)>>( + "Activity__isDestroyed") .asFunction)>(); /// from: public boolean isDestroyed() @@ -10751,9 +10757,9 @@ class Activity extends jni.JObject { } static final _isChangingConfigurations = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isChangingConfigurations") + ffi + .NativeFunction)>>( + "Activity__isChangingConfigurations") .asFunction)>(); /// from: public boolean isChangingConfigurations() @@ -10762,9 +10768,9 @@ class Activity extends jni.JObject { } static final _recreate = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__recreate") + ffi + .NativeFunction)>>( + "Activity__recreate") .asFunction)>(); /// from: public void recreate() @@ -10773,9 +10779,9 @@ class Activity extends jni.JObject { } static final _finish = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__finish") + ffi + .NativeFunction)>>( + "Activity__finish") .asFunction)>(); /// from: public void finish() @@ -10784,9 +10790,9 @@ class Activity extends jni.JObject { } static final _finishAffinity = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__finishAffinity") + ffi + .NativeFunction)>>( + "Activity__finishAffinity") .asFunction)>(); /// from: public void finishAffinity() @@ -10810,9 +10816,9 @@ class Activity extends jni.JObject { } static final _finishAfterTransition = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__finishAfterTransition") + ffi + .NativeFunction)>>( + "Activity__finishAfterTransition") .asFunction)>(); /// from: public void finishAfterTransition() @@ -10852,9 +10858,9 @@ class Activity extends jni.JObject { } static final _finishAndRemoveTask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__finishAndRemoveTask") + ffi + .NativeFunction)>>( + "Activity__finishAndRemoveTask") .asFunction)>(); /// from: public void finishAndRemoveTask() @@ -10863,9 +10869,9 @@ class Activity extends jni.JObject { } static final _releaseInstance = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__releaseInstance") + ffi + .NativeFunction)>>( + "Activity__releaseInstance") .asFunction)>(); /// from: public boolean releaseInstance() @@ -10945,9 +10951,9 @@ class Activity extends jni.JObject { } static final _getRequestedOrientation = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getRequestedOrientation") + ffi + .NativeFunction)>>( + "Activity__getRequestedOrientation") .asFunction)>(); /// from: public int getRequestedOrientation() @@ -10956,9 +10962,9 @@ class Activity extends jni.JObject { } static final _getTaskId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getTaskId") + ffi + .NativeFunction)>>( + "Activity__getTaskId") .asFunction)>(); /// from: public int getTaskId() @@ -10967,9 +10973,9 @@ class Activity extends jni.JObject { } static final _isTaskRoot = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isTaskRoot") + ffi + .NativeFunction)>>( + "Activity__isTaskRoot") .asFunction)>(); /// from: public boolean isTaskRoot() @@ -10991,9 +10997,9 @@ class Activity extends jni.JObject { } static final _getLocalClassName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getLocalClassName") + ffi + .NativeFunction)>>( + "Activity__getLocalClassName") .asFunction)>(); /// from: public java.lang.String getLocalClassName() @@ -11004,9 +11010,9 @@ class Activity extends jni.JObject { } static final _getComponentName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getComponentName") + ffi + .NativeFunction)>>( + "Activity__getComponentName") .asFunction)>(); /// from: public android.content.ComponentName getComponentName() @@ -11031,9 +11037,9 @@ class Activity extends jni.JObject { } static final _isLaunchedFromBubble = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isLaunchedFromBubble") + ffi + .NativeFunction)>>( + "Activity__isLaunchedFromBubble") .asFunction)>(); /// from: public boolean isLaunchedFromBubble() @@ -11100,9 +11106,9 @@ class Activity extends jni.JObject { } static final _getTitle = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getTitle") + ffi + .NativeFunction)>>( + "Activity__getTitle") .asFunction)>(); /// from: public final java.lang.CharSequence getTitle() @@ -11112,9 +11118,9 @@ class Activity extends jni.JObject { } static final _getTitleColor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getTitleColor") + ffi + .NativeFunction)>>( + "Activity__getTitleColor") .asFunction)>(); /// from: public final int getTitleColor() @@ -11254,9 +11260,9 @@ class Activity extends jni.JObject { } static final _getVolumeControlStream = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getVolumeControlStream") + ffi + .NativeFunction)>>( + "Activity__getVolumeControlStream") .asFunction)>(); /// from: public final int getVolumeControlStream() @@ -11280,9 +11286,9 @@ class Activity extends jni.JObject { } static final _getMediaController = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getMediaController") + ffi + .NativeFunction)>>( + "Activity__getMediaController") .asFunction)>(); /// from: public final android.media.session.MediaController getMediaController() @@ -11392,9 +11398,9 @@ class Activity extends jni.JObject { } static final _isImmersive = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__isImmersive") + ffi + .NativeFunction)>>( + "Activity__isImmersive") .asFunction)>(); /// from: public boolean isImmersive() @@ -11429,9 +11435,9 @@ class Activity extends jni.JObject { } static final _onVisibleBehindCanceled = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onVisibleBehindCanceled") + ffi + .NativeFunction)>>( + "Activity__onVisibleBehindCanceled") .asFunction)>(); /// from: public void onVisibleBehindCanceled() @@ -11440,9 +11446,9 @@ class Activity extends jni.JObject { } static final _onEnterAnimationComplete = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__onEnterAnimationComplete") + ffi + .NativeFunction)>>( + "Activity__onEnterAnimationComplete") .asFunction)>(); /// from: public void onEnterAnimationComplete() @@ -11636,9 +11642,9 @@ class Activity extends jni.JObject { } static final _getParentActivityIntent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__getParentActivityIntent") + ffi + .NativeFunction)>>( + "Activity__getParentActivityIntent") .asFunction)>(); /// from: public android.content.Intent getParentActivityIntent() @@ -11685,9 +11691,9 @@ class Activity extends jni.JObject { } static final _postponeEnterTransition = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__postponeEnterTransition") + ffi + .NativeFunction)>>( + "Activity__postponeEnterTransition") .asFunction)>(); /// from: public void postponeEnterTransition() @@ -11696,8 +11702,8 @@ class Activity extends jni.JObject { } static final _startPostponedEnterTransition = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__startPostponedEnterTransition") .asFunction)>(); @@ -11725,9 +11731,9 @@ class Activity extends jni.JObject { } static final _startLockTask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__startLockTask") + ffi + .NativeFunction)>>( + "Activity__startLockTask") .asFunction)>(); /// from: public void startLockTask() @@ -11736,9 +11742,9 @@ class Activity extends jni.JObject { } static final _stopLockTask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Activity__stopLockTask") + ffi + .NativeFunction)>>( + "Activity__stopLockTask") .asFunction)>(); /// from: public void stopLockTask() @@ -11747,8 +11753,8 @@ class Activity extends jni.JObject { } static final _showLockTaskEscapeMessage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__showLockTaskEscapeMessage") .asFunction)>(); @@ -11810,8 +11816,8 @@ class Activity extends jni.JObject { } static final _getOnBackInvokedDispatcher = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>( + ffi + .NativeFunction)>>( "Activity__getOnBackInvokedDispatcher") .asFunction)>(); @@ -11896,8 +11902,9 @@ class Instant extends jni.JObject { } static final _now1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Instant__now1") + ffi + .NativeFunction)>>( + "Instant__now1") .asFunction)>(); /// from: static public java.time.Instant now(java.time.Clock clock) @@ -11949,8 +11956,9 @@ class Instant extends jni.JObject { } static final _from = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Instant__from") + ffi + .NativeFunction)>>( + "Instant__from") .asFunction)>(); /// from: static public java.time.Instant from(java.time.temporal.TemporalAccessor temporalAccessor) @@ -11963,8 +11971,9 @@ class Instant extends jni.JObject { } static final _parse = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer)>>("Instant__parse") + ffi + .NativeFunction)>>( + "Instant__parse") .asFunction)>(); /// from: static public java.time.Instant parse(java.lang.CharSequence charSequence) @@ -12053,9 +12062,9 @@ class Instant extends jni.JObject { } static final _getEpochSecond = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Instant__getEpochSecond") + ffi + .NativeFunction)>>( + "Instant__getEpochSecond") .asFunction)>(); /// from: public long getEpochSecond() @@ -12064,9 +12073,9 @@ class Instant extends jni.JObject { } static final _getNano = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Instant__getNano") + ffi + .NativeFunction)>>( + "Instant__getNano") .asFunction)>(); /// from: public int getNano() @@ -12367,9 +12376,9 @@ class Instant extends jni.JObject { } static final _toEpochMilli = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Instant__toEpochMilli") + ffi + .NativeFunction)>>( + "Instant__toEpochMilli") .asFunction)>(); /// from: public long toEpochMilli() @@ -12438,9 +12447,9 @@ class Instant extends jni.JObject { } static final _hashCode1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Instant__hashCode1") + ffi + .NativeFunction)>>( + "Instant__hashCode1") .asFunction)>(); /// from: public int hashCode() @@ -12449,9 +12458,9 @@ class Instant extends jni.JObject { } static final _toString1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("Instant__toString1") + ffi + .NativeFunction)>>( + "Instant__toString1") .asFunction)>(); /// from: public java.lang.String toString() @@ -13101,9 +13110,9 @@ class ReadRecordsRequest<$T extends jni.JObject> extends jni.JObject { } static final _hashCode1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("ReadRecordsRequest__hashCode1") + ffi + .NativeFunction)>>( + "ReadRecordsRequest__hashCode1") .asFunction)>(); /// from: public int hashCode() @@ -13178,9 +13187,9 @@ class AggregationResult extends jni.JObject { } static final _getDataOrigins = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer)>>("AggregationResult__getDataOrigins") + ffi + .NativeFunction)>>( + "AggregationResult__getDataOrigins") .asFunction)>(); /// from: public final java.util.Set getDataOrigins() diff --git a/experimental/pedometer/lib/pedometer_bindings_generated.dart b/experimental/pedometer/lib/pedometer_bindings_generated.dart index eb8f521a5..65f0432fa 100644 --- a/experimental/pedometer/lib/pedometer_bindings_generated.dart +++ b/experimental/pedometer/lib/pedometer_bindings_generated.dart @@ -20723,8 +20723,8 @@ class PedometerBindings { 'objc_msgSend'); late final __objc_msgSend_728 = __objc_msgSend_728Ptr.asFunction< ffi.Pointer< - ffi.NativeFunction< - ffi.UnsignedLong Function(ffi.Pointer)>> + ffi + .NativeFunction)>> Function(ffi.Pointer, ffi.Pointer)>(); late final _sel_setSizeFunction_1 = _registerName1("setSizeFunction:"); @@ -20732,8 +20732,8 @@ class PedometerBindings { ffi.Pointer obj, ffi.Pointer sel, ffi.Pointer< - ffi.NativeFunction< - ffi.UnsignedLong Function(ffi.Pointer)>> + ffi + .NativeFunction)>> value, ) { return __objc_msgSend_729( @@ -32540,21 +32540,21 @@ class ObjCBlock7 extends _ObjCBlockBase { ObjCBlock7.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< + ffi + .NativeFunction< ffi.Bool Function(ffi.Pointer arg0, ffi.Pointer arg1)>> ptr) : this._( - lib - ._newBlock1( - _cFuncTrampoline ??= ffi.Pointer.fromFunction< - ffi.Bool Function( - ffi.Pointer<_ObjCBlock> block, - ffi.Pointer arg0, - ffi.Pointer arg1)>( - _ObjCBlock7_fnPtrTrampoline, false) - .cast(), - ptr.cast()), + lib._newBlock1( + _cFuncTrampoline ??= ffi.Pointer.fromFunction< + ffi.Bool Function( + ffi.Pointer<_ObjCBlock> block, + ffi.Pointer arg0, + ffi.Pointer arg1)>( + _ObjCBlock7_fnPtrTrampoline, false) + .cast(), + ptr.cast()), lib); static ffi.Pointer? _cFuncTrampoline; @@ -32817,21 +32817,21 @@ class ObjCBlock8 extends _ObjCBlockBase { ObjCBlock8.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< + ffi + .NativeFunction< ffi.Bool Function(ffi.Pointer arg0, ffi.Pointer arg1)>> ptr) : this._( - lib - ._newBlock1( - _cFuncTrampoline ??= ffi.Pointer.fromFunction< - ffi.Bool Function( - ffi.Pointer<_ObjCBlock> block, - ffi.Pointer arg0, - ffi.Pointer arg1)>( - _ObjCBlock8_fnPtrTrampoline, false) - .cast(), - ptr.cast()), + lib._newBlock1( + _cFuncTrampoline ??= ffi.Pointer.fromFunction< + ffi.Bool Function( + ffi.Pointer<_ObjCBlock> block, + ffi.Pointer arg0, + ffi.Pointer arg1)>( + _ObjCBlock8_fnPtrTrampoline, false) + .cast(), + ptr.cast()), lib); static ffi.Pointer? _cFuncTrampoline; @@ -33527,19 +33527,26 @@ class ObjCBlock10 extends _ObjCBlockBase { /// Creates a block from a C function pointer. ObjCBlock10.fromFunctionPointer( PedometerBindings lib, - ffi.Pointer arg0, ffi.Pointer arg1, ffi.Pointer arg2)>> + ffi.Pointer< + ffi + .NativeFunction< + ffi.Bool Function( + ffi.Pointer arg0, + ffi.Pointer arg1, + ffi.Pointer arg2)>> ptr) : this._( - lib._newBlock1( - _cFuncTrampoline ??= ffi.Pointer.fromFunction< - ffi.Bool Function( - ffi.Pointer<_ObjCBlock> block, - ffi.Pointer arg0, - ffi.Pointer arg1, - ffi.Pointer arg2)>( - _ObjCBlock10_fnPtrTrampoline, false) - .cast(), - ptr.cast()), + lib + ._newBlock1( + _cFuncTrampoline ??= ffi.Pointer.fromFunction< + ffi.Bool Function( + ffi.Pointer<_ObjCBlock> block, + ffi.Pointer arg0, + ffi.Pointer arg1, + ffi.Pointer arg2)>( + _ObjCBlock10_fnPtrTrampoline, false) + .cast(), + ptr.cast()), lib); static ffi.Pointer? _cFuncTrampoline; @@ -35542,7 +35549,8 @@ class ObjCBlock17 extends _ObjCBlockBase { ObjCBlock17.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< + ffi + .NativeFunction< ffi.Bool Function(ffi.Pointer arg0, ffi.Pointer arg1)>> ptr) @@ -36317,8 +36325,8 @@ class ObjCBlock18 extends _ObjCBlockBase { ObjCBlock18.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -36443,21 +36451,21 @@ class ObjCBlock19 extends _ObjCBlockBase { ObjCBlock19.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< + ffi + .NativeFunction< ffi.Bool Function(ffi.Pointer arg0, ffi.Pointer arg1)>> ptr) : this._( - lib - ._newBlock1( - _cFuncTrampoline ??= ffi.Pointer.fromFunction< - ffi.Bool Function( - ffi.Pointer<_ObjCBlock> block, - ffi.Pointer arg0, - ffi.Pointer arg1)>( - _ObjCBlock19_fnPtrTrampoline, false) - .cast(), - ptr.cast()), + lib._newBlock1( + _cFuncTrampoline ??= ffi.Pointer.fromFunction< + ffi.Bool Function( + ffi.Pointer<_ObjCBlock> block, + ffi.Pointer arg0, + ffi.Pointer arg1)>( + _ObjCBlock19_fnPtrTrampoline, false) + .cast(), + ptr.cast()), lib); static ffi.Pointer? _cFuncTrampoline; @@ -38976,8 +38984,8 @@ class ObjCBlock21 extends _ObjCBlockBase { void call() { return _id.ref.invoke .cast< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer<_ObjCBlock> block)>>() + ffi + .NativeFunction block)>>() .asFunction block)>()(_id); } @@ -46915,8 +46923,8 @@ class ObjCBlock34 extends _ObjCBlockBase { ObjCBlock34.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -47572,8 +47580,8 @@ class ObjCBlock35 extends _ObjCBlockBase { ObjCBlock35.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -50030,8 +50038,8 @@ class ObjCBlock36 extends _ObjCBlockBase { ObjCBlock36.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -51501,8 +51509,8 @@ class NSPointerFunctions extends NSObject { set sizeFunction( ffi.Pointer< - ffi.NativeFunction< - ffi.UnsignedLong Function(ffi.Pointer)>> + ffi + .NativeFunction)>> value) { _lib._objc_msgSend_729(_id, _lib._sel_setSizeFunction_1, value); } @@ -53504,8 +53512,8 @@ class ObjCBlock39 extends _ObjCBlockBase { ObjCBlock39.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -54881,8 +54889,8 @@ class ObjCBlock41 extends _ObjCBlockBase { ObjCBlock41.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -54951,8 +54959,8 @@ class ObjCBlock42 extends _ObjCBlockBase { ObjCBlock42.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( @@ -57737,8 +57745,8 @@ class ObjCBlock44 extends _ObjCBlockBase { ObjCBlock44.fromFunctionPointer( PedometerBindings lib, ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer arg0)>> + ffi + .NativeFunction arg0)>> ptr) : this._( lib._newBlock1( diff --git a/experimental/pedometer/pubspec.yaml b/experimental/pedometer/pubspec.yaml index d00b0145b..5abb93795 100644 --- a/experimental/pedometer/pubspec.yaml +++ b/experimental/pedometer/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 publish_to: "none" environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 flutter: ">=2.11.0" dependencies: diff --git a/experimental/varfont_shader_puzzle/.metadata b/experimental/varfont_shader_puzzle/.metadata index da5cd1957..71d214376 100644 --- a/experimental/varfont_shader_puzzle/.metadata +++ b/experimental/varfont_shader_puzzle/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,23 +13,23 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/experimental/varfont_shader_puzzle/android/app/build.gradle b/experimental/varfont_shader_puzzle/android/app/build.gradle index 978af83dd..665ab6722 100644 --- a/experimental/varfont_shader_puzzle/android/app/build.gradle +++ b/experimental/varfont_shader_puzzle/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "com.example.varfont_shader_puzzle" compileSdkVersion flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/experimental/varfont_shader_puzzle/android/settings.gradle b/experimental/varfont_shader_puzzle/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/experimental/varfont_shader_puzzle/android/settings.gradle +++ b/experimental/varfont_shader_puzzle/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj index 754adcc3c..a0fd2a9ee 100644 --- a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj +++ b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj @@ -8,14 +8,14 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 26D1554A150472F5B3303507 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEE71CDBA93E638CB67CFF63 /* Pods_RunnerTests.framework */; }; + 274CAE2278653B34AA67BAF4 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FB48EC5D2F51E3C6067BC8C /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 7233A29DEBA7455B6EDCBF98 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00E199A2B4F4C087FEF66C4C /* 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 */; }; - 9DCCF30273485AE5195174F8 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF7CF8974406B7EEAAA60ED3 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,19 +42,19 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 00E199A2B4F4C087FEF66C4C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; - 1AC92CA7BD888E07DB5478C1 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 1E81082542ECA416F5FE9C0C /* 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 = ""; }; + 1B22241338DFDF012F701081 /* 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 = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3D736C2F91171BFCE01C185F /* 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 = ""; }; - 44A61948DC7F150B587F098A /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 4F88732B7FDBC15A461F4411 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 7242D5D7DDEA52DE532359BC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.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 = ""; }; + 77F2B24020292D860499D51D /* 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 = ""; }; + 7FB48EC5D2F51E3C6067BC8C /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.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; }; @@ -62,17 +62,17 @@ 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 = ""; }; - AEE71CDBA93E638CB67CFF63 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DF7CF8974406B7EEAAA60ED3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F95FD7A7DA5180C618BB4CC4 /* 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 = ""; }; + A6568B58578339EDB4E84FF2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + BFC5C9C664D70F06255F80B8 /* 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 = ""; }; + FB0340B52CB363D48EC53D3A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 536B709FE5B15779EC6960BC /* Frameworks */ = { + 1904215041CC9FE7FA2641DE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 26D1554A150472F5B3303507 /* Pods_RunnerTests.framework in Frameworks */, + 274CAE2278653B34AA67BAF4 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -80,28 +80,33 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9DCCF30273485AE5195174F8 /* Pods_Runner.framework in Frameworks */, + 7233A29DEBA7455B6EDCBF98 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 20C3304B9592761735C16873 /* Frameworks */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( - DF7CF8974406B7EEAAA60ED3 /* Pods_Runner.framework */, - AEE71CDBA93E638CB67CFF63 /* Pods_RunnerTests.framework */, + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - name = Frameworks; + path = RunnerTests; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 5E41D2B14CF4B3B24D53C9E9 /* Pods */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + 1B22241338DFDF012F701081 /* Pods-Runner.debug.xcconfig */, + 77F2B24020292D860499D51D /* Pods-Runner.release.xcconfig */, + BFC5C9C664D70F06255F80B8 /* Pods-Runner.profile.xcconfig */, + FB0340B52CB363D48EC53D3A /* Pods-RunnerTests.debug.xcconfig */, + A6568B58578339EDB4E84FF2 /* Pods-RunnerTests.release.xcconfig */, + 7242D5D7DDEA52DE532359BC /* Pods-RunnerTests.profile.xcconfig */, ); - path = RunnerTests; + name = Pods; + path = Pods; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -122,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - B03B48861A3F6E0BB2B2EB78 /* Pods */, - 20C3304B9592761735C16873 /* Frameworks */, + 5E41D2B14CF4B3B24D53C9E9 /* Pods */, + E0A8A16DFD61CC8D0CD83EA7 /* Frameworks */, ); sourceTree = ""; }; @@ -151,18 +156,13 @@ path = Runner; sourceTree = ""; }; - B03B48861A3F6E0BB2B2EB78 /* Pods */ = { + E0A8A16DFD61CC8D0CD83EA7 /* Frameworks */ = { isa = PBXGroup; children = ( - 1E81082542ECA416F5FE9C0C /* Pods-Runner.debug.xcconfig */, - F95FD7A7DA5180C618BB4CC4 /* Pods-Runner.release.xcconfig */, - 3D736C2F91171BFCE01C185F /* Pods-Runner.profile.xcconfig */, - 4F88732B7FDBC15A461F4411 /* Pods-RunnerTests.debug.xcconfig */, - 44A61948DC7F150B587F098A /* Pods-RunnerTests.release.xcconfig */, - 1AC92CA7BD888E07DB5478C1 /* Pods-RunnerTests.profile.xcconfig */, + 00E199A2B4F4C087FEF66C4C /* Pods_Runner.framework */, + 7FB48EC5D2F51E3C6067BC8C /* Pods_RunnerTests.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 334C2424393A6F59123E32A2 /* [CP] Check Pods Manifest.lock */, + BFFCDF0D2873C213EAB3BD5D /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - 536B709FE5B15779EC6960BC /* Frameworks */, + 1904215041CC9FE7FA2641DE /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 023068A082D6F75D3762E2CA /* [CP] Check Pods Manifest.lock */, + CC0AAC2435623BF854FAA61A /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 2BF30889E4E6069E478C94EE /* [CP] Embed Pods Frameworks */, + 7C1C2AF1309544E80EC82773 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -215,7 +215,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { @@ -269,29 +270,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 023068A082D6F75D3762E2CA /* [CP] Check Pods Manifest.lock */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); + 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"; }; - 2BF30889E4E6069E478C94EE /* [CP] Embed Pods Frameworks */ = { + 7C1C2AF1309544E80EC82773 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -308,58 +303,64 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 334C2424393A6F59123E32A2 /* [CP] Check Pods Manifest.lock */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( ); + name = "Run Script"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-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\" build"; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + BFFCDF0D2873C213EAB3BD5D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + "${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-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + 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 */ = { + CC0AAC2435623BF854FAA61A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Run Script"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + 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 */ @@ -484,7 +485,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4F88732B7FDBC15A461F4411 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = FB0340B52CB363D48EC53D3A /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -502,7 +503,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44A61948DC7F150B587F098A /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A6568B58578339EDB4E84FF2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -518,7 +519,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1AC92CA7BD888E07DB5478C1 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 7242D5D7DDEA52DE532359BC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e42adcb34..87131a09b 100644 --- a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj index 0678ac37b..54c172845 100644 --- a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj +++ b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 2586B4DC348BF0B2687393E8 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 549E802F2F91925820558837 /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 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 */; }; - 80AB9C44B84A242BF04AE78A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE962DFF14715138B179FFB /* Pods_Runner.framework */; }; - C260AE138D5E1454BE40C5AE /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A814A761051234DA177EC307 /* Pods_RunnerTests.framework */; }; + 3F44376C20F72E004A11360B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60A033E9436997E461230E73 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 07CDECD88E0D44609E12B424 /* 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 = ""; }; - 0CE962DFF14715138B179FFB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 003EF89E32FD165D71C19A8A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 13CA7ECF4249FCEA8B7EBBF5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +80,14 @@ 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 = ""; }; - 3A1B47756B7B4D7EE7DF197B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 50CF2F94F9F402D5586319F8 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 63618379F3E72D921949E13E /* 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 = ""; }; + 549E802F2F91925820558837 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 60A033E9436997E461230E73 /* 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 = ""; }; - A814A761051234DA177EC307 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A9F14249D4235F5D36A585BA /* 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 = ""; }; - EF15A591243E87B71AF217D9 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + AC5E6F214CB6050537E03F56 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + C1AF5702D171A4079F32516B /* 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 = ""; }; + D3A30F655836FAC3844EDC10 /* 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 = ""; }; + F5293533F0BB837E5BC6AEDB /* 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 */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C260AE138D5E1454BE40C5AE /* Pods_RunnerTests.framework in Frameworks */, + 2586B4DC348BF0B2687393E8 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,27 +103,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 80AB9C44B84A242BF04AE78A /* Pods_Runner.framework in Frameworks */, + 3F44376C20F72E004A11360B /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 17036ED6657BCE3F0831A887 /* Pods */ = { - isa = PBXGroup; - children = ( - A9F14249D4235F5D36A585BA /* Pods-Runner.debug.xcconfig */, - 63618379F3E72D921949E13E /* Pods-Runner.release.xcconfig */, - 07CDECD88E0D44609E12B424 /* Pods-Runner.profile.xcconfig */, - EF15A591243E87B71AF217D9 /* Pods-RunnerTests.debug.xcconfig */, - 50CF2F94F9F402D5586319F8 /* Pods-RunnerTests.release.xcconfig */, - 3A1B47756B7B4D7EE7DF197B /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -151,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 17036ED6657BCE3F0831A887 /* Pods */, + AD6B70903BFDDA6B8E269D12 /* Pods */, ); sourceTree = ""; }; @@ -199,11 +185,25 @@ path = Runner; sourceTree = ""; }; + AD6B70903BFDDA6B8E269D12 /* Pods */ = { + isa = PBXGroup; + children = ( + D3A30F655836FAC3844EDC10 /* Pods-Runner.debug.xcconfig */, + F5293533F0BB837E5BC6AEDB /* Pods-Runner.release.xcconfig */, + C1AF5702D171A4079F32516B /* Pods-Runner.profile.xcconfig */, + 003EF89E32FD165D71C19A8A /* Pods-RunnerTests.debug.xcconfig */, + 13CA7ECF4249FCEA8B7EBBF5 /* Pods-RunnerTests.release.xcconfig */, + AC5E6F214CB6050537E03F56 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 0CE962DFF14715138B179FFB /* Pods_Runner.framework */, - A814A761051234DA177EC307 /* Pods_RunnerTests.framework */, + 60A033E9436997E461230E73 /* Pods_Runner.framework */, + 549E802F2F91925820558837 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 5975CA6C732EAE9C57500714 /* [CP] Check Pods Manifest.lock */, + EC6A413EA6E6972E95A8B5DF /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 0375824CC7926812E73053B2 /* [CP] Check Pods Manifest.lock */, + DEE1CCAA1E27BD0B522B2606 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1D6B47AB550E8DF0286BF729 /* [CP] Embed Pods Frameworks */, + F8B0D1028F4F9CFBEF4BF3DE /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -259,7 +259,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -322,103 +322,103 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0375824CC7926812E73053B2 /* [CP] Check Pods Manifest.lock */ = { + 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; 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; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; }; - 1D6B47AB550E8DF0286BF729 /* [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"; }; - 3399D490228B24CF009A79C7 /* ShellScript */ = { + DEE1CCAA1E27BD0B522B2606 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; 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 = "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 */ = { + EC6A413EA6E6972E95A8B5DF /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, ); inputPaths = ( - Flutter/ephemeral/tripwire, + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, ); outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + 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; }; - 5975CA6C732EAE9C57500714 /* [CP] Check Pods Manifest.lock */ = { + F8B0D1028F4F9CFBEF4BF3DE /* [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-RunnerTests-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 */ @@ -472,7 +472,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EF15A591243E87B71AF217D9 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 003EF89E32FD165D71C19A8A /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -487,7 +487,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 50CF2F94F9F402D5586319F8 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 13CA7ECF4249FCEA8B7EBBF5 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -502,7 +502,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3A1B47756B7B4D7EE7DF197B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = AC5E6F214CB6050537E03F56 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 9aa0ca2b9..0bd9e4630 100644 --- a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/experimental/web_dashboard/pubspec.yaml b/experimental/web_dashboard/pubspec.yaml index 736e0afa8..fb4210727 100644 --- a/experimental/web_dashboard/pubspec.yaml +++ b/experimental/web_dashboard/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0+1 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: charts_flutter: ^0.12.0 diff --git a/flutter_maps_firestore/.metadata b/flutter_maps_firestore/.metadata index 1f7c11d5e..d201f6335 100644 --- a/flutter_maps_firestore/.metadata +++ b/flutter_maps_firestore/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj b/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj index c6c90ae3c..1bd83092b 100644 --- a/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj @@ -168,7 +168,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { 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 e42adcb34..87131a09b 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 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/form_app/.metadata b/form_app/.metadata index e94891d5f..0e49e8aa9 100644 --- a/form_app/.metadata +++ b/form_app/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: web - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/form_app/android/app/build.gradle b/form_app/android/app/build.gradle index d12d7bd59..c36c9f6d7 100644 --- a/form_app/android/app/build.gradle +++ b/form_app/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "dev.flutter.formApp.form_app" compileSdkVersion flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/form_app/android/settings.gradle b/form_app/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/form_app/android/settings.gradle +++ b/form_app/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/form_app/ios/Runner.xcodeproj/project.pbxproj b/form_app/ios/Runner.xcodeproj/project.pbxproj index 3b33f791b..fcd91cf65 100644 --- a/form_app/ios/Runner.xcodeproj/project.pbxproj +++ b/form_app/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 12A85A8CE7C3DF157974DF4B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6B487009DFAA59E8CD7B4A8 /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 355B2F6448CCF90AB1AB64A4 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB0AB0DE1EE73C67D694F0A0 /* Pods_RunnerTests.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 6E07900F184F86CB767D5F0E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DB2F5E5C727BA87083DA58F /* Pods_RunnerTests.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 */; }; - A9D5D7A61B995D995F81F9B5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECC43B4B56DC523A467CA1E9 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,19 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 08AC4D5C4791FFB5EF8B7587 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.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 = ""; }; + 30FC240768A4F883E1E0AB32 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 323C99AB430044B2C2FBA6E1 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 3A5B91D033CFB774CA78D43B /* 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 = ""; }; - 6FF405332DE2C27B9E223C63 /* 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 = ""; }; + 7616ACB938FB95E374B6E2AC /* 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 = ""; }; - 8B3C5D7C925E329C7D4524B7 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 83B38095864C2C81C5CEE675 /* 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 = ""; }; + 8EFAB7EA39437877278BA55F /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.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; }; @@ -61,10 +62,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 = ""; }; - 9DB2F5E5C727BA87083DA58F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BC370531F1A5037A8C9289A5 /* 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 = ""; }; - ECC43B4B56DC523A467CA1E9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F37FFA0F2882E9CEDB3F3D32 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + C6B487009DFAA59E8CD7B4A8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E06D145AE67B09EAEAE39731 /* 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 = ""; }; + FB0AB0DE1EE73C67D694F0A0 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,15 +72,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D5D7A61B995D995F81F9B5 /* Pods_Runner.framework in Frameworks */, + 12A85A8CE7C3DF157974DF4B /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - D9941DCF3302AD249D7087A1 /* Frameworks */ = { + EA1ED34F61745913BEFA27D8 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6E07900F184F86CB767D5F0E /* Pods_RunnerTests.framework in Frameworks */, + 355B2F6448CCF90AB1AB64A4 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -113,8 +113,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - FB7E099D6C8764238953E7AE /* Pods */, - A30CC3F32A73405299FCF2E6 /* Frameworks */, + ADE01E0C5B8D6E990CC70C41 /* Pods */, + EAA13BBA2FEC6644673C8DD4 /* Frameworks */, ); sourceTree = ""; }; @@ -142,27 +142,27 @@ path = Runner; sourceTree = ""; }; - A30CC3F32A73405299FCF2E6 /* Frameworks */ = { + ADE01E0C5B8D6E990CC70C41 /* Pods */ = { isa = PBXGroup; children = ( - ECC43B4B56DC523A467CA1E9 /* Pods_Runner.framework */, - 9DB2F5E5C727BA87083DA58F /* Pods_RunnerTests.framework */, + 83B38095864C2C81C5CEE675 /* Pods-Runner.debug.xcconfig */, + 7616ACB938FB95E374B6E2AC /* Pods-Runner.release.xcconfig */, + E06D145AE67B09EAEAE39731 /* Pods-Runner.profile.xcconfig */, + 30FC240768A4F883E1E0AB32 /* Pods-RunnerTests.debug.xcconfig */, + 8EFAB7EA39437877278BA55F /* Pods-RunnerTests.release.xcconfig */, + 323C99AB430044B2C2FBA6E1 /* Pods-RunnerTests.profile.xcconfig */, ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; - FB7E099D6C8764238953E7AE /* Pods */ = { + EAA13BBA2FEC6644673C8DD4 /* Frameworks */ = { isa = PBXGroup; children = ( - 3A5B91D033CFB774CA78D43B /* Pods-Runner.debug.xcconfig */, - BC370531F1A5037A8C9289A5 /* Pods-Runner.release.xcconfig */, - 6FF405332DE2C27B9E223C63 /* Pods-Runner.profile.xcconfig */, - 8B3C5D7C925E329C7D4524B7 /* Pods-RunnerTests.debug.xcconfig */, - 08AC4D5C4791FFB5EF8B7587 /* Pods-RunnerTests.release.xcconfig */, - F37FFA0F2882E9CEDB3F3D32 /* Pods-RunnerTests.profile.xcconfig */, + C6B487009DFAA59E8CD7B4A8 /* Pods_Runner.framework */, + FB0AB0DE1EE73C67D694F0A0 /* Pods_RunnerTests.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 93436C0160AA39053481098A /* [CP] Check Pods Manifest.lock */, + 616164CB241A80EDE0A70FF2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - D9941DCF3302AD249D7087A1 /* Frameworks */, + EA1ED34F61745913BEFA27D8 /* Frameworks */, ); buildRules = ( ); @@ -191,7 +191,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - E94D642FC02DF2CBE1C0D4D5 /* [CP] Check Pods Manifest.lock */, + B8A1ACCFCC221BCD2B4FC51A /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -214,7 +214,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { @@ -284,7 +285,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 93436C0160AA39053481098A /* [CP] Check Pods Manifest.lock */ = { + 616164CB241A80EDE0A70FF2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -321,7 +322,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - E94D642FC02DF2CBE1C0D4D5 /* [CP] Check Pods Manifest.lock */ = { + B8A1ACCFCC221BCD2B4FC51A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -466,7 +467,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8B3C5D7C925E329C7D4524B7 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 30FC240768A4F883E1E0AB32 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -484,7 +485,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 08AC4D5C4791FFB5EF8B7587 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 8EFAB7EA39437877278BA55F /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -500,7 +501,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F37FFA0F2882E9CEDB3F3D32 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 323C99AB430044B2C2FBA6E1 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/form_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/form_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e42adcb34..87131a09b 100644 --- a/form_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/form_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/form_app/macos/Runner.xcodeproj/project.pbxproj b/form_app/macos/Runner.xcodeproj/project.pbxproj index 6de4abde4..baa2941b7 100644 --- a/form_app/macos/Runner.xcodeproj/project.pbxproj +++ b/form_app/macos/Runner.xcodeproj/project.pbxproj @@ -27,8 +27,8 @@ 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 */; }; - 5F1A284C633869C018987011 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D1B9EFD531FF5D6CD4F68E0 /* Pods_Runner.framework */; }; - 63D903444211C26B1D9AF2D2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 206D905451BFDC4C5B86EFBD /* Pods_RunnerTests.framework */; }; + 9A28B37E8E749D3616650B58 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE75C8CADB66AC752C34139F /* Pods_RunnerTests.framework */; }; + E257EE33A54BD5D01EEC0068 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47E444383244AC1E52EF6618 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 206D905451BFDC4C5B86EFBD /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D1B9EFD531FF5D6CD4F68E0 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F7E5F69EAEA56D4D899D89B /* 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 = ""; }; + 1C1825314C487936DFB88FA7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 21B094E75811127B08FD354B /* 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 = ""; }; + 2A3D0323A2E654459C97A7A3 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +82,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 = ""; }; - 3CF9168209929CDE2F7DC51E /* 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 = ""; }; - 59B41406B5664C42E55A4BCE /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 5BE4E551B55E70E2F07EF437 /* 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 = ""; }; + 47E444383244AC1E52EF6618 /* 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 = ""; }; - 84D9FA2994E5754C2041608C /* 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 = ""; }; - BC3B36EF588FC8D4C6D7BEC5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - D7B25570D85315AD001926AF /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 9E3FE276389598536702FD2F /* 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 = ""; }; + CE75C8CADB66AC752C34139F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DED1A1BF8434CB19F3C04AD2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 63D903444211C26B1D9AF2D2 /* Pods_RunnerTests.framework in Frameworks */, + 9A28B37E8E749D3616650B58 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5F1A284C633869C018987011 /* Pods_Runner.framework in Frameworks */, + E257EE33A54BD5D01EEC0068 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 8928B7CB6C7DCA0EF2926002 /* Pods */, + 9C39F138EF7184F701A3F30B /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - 8928B7CB6C7DCA0EF2926002 /* Pods */ = { + 9C39F138EF7184F701A3F30B /* Pods */ = { isa = PBXGroup; children = ( - 84D9FA2994E5754C2041608C /* Pods-Runner.debug.xcconfig */, - 5BE4E551B55E70E2F07EF437 /* Pods-Runner.release.xcconfig */, - 3CF9168209929CDE2F7DC51E /* Pods-Runner.profile.xcconfig */, - D7B25570D85315AD001926AF /* Pods-RunnerTests.debug.xcconfig */, - BC3B36EF588FC8D4C6D7BEC5 /* Pods-RunnerTests.release.xcconfig */, - 59B41406B5664C42E55A4BCE /* Pods-RunnerTests.profile.xcconfig */, + 9E3FE276389598536702FD2F /* Pods-Runner.debug.xcconfig */, + 21B094E75811127B08FD354B /* Pods-Runner.release.xcconfig */, + 0F7E5F69EAEA56D4D899D89B /* Pods-Runner.profile.xcconfig */, + DED1A1BF8434CB19F3C04AD2 /* Pods-RunnerTests.debug.xcconfig */, + 1C1825314C487936DFB88FA7 /* Pods-RunnerTests.release.xcconfig */, + 2A3D0323A2E654459C97A7A3 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 2D1B9EFD531FF5D6CD4F68E0 /* Pods_Runner.framework */, - 206D905451BFDC4C5B86EFBD /* Pods_RunnerTests.framework */, + 47E444383244AC1E52EF6618 /* Pods_Runner.framework */, + CE75C8CADB66AC752C34139F /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 160D403727B34F0411BC79FF /* [CP] Check Pods Manifest.lock */, + 61510D7B8B6E676949967216 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 6C684549A4B875261B12017F /* [CP] Check Pods Manifest.lock */, + 3B26844C6DA47A5050EE7453 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 4338C53303986A87E9FC660D /* [CP] Embed Pods Frameworks */, + 2B57C8696806073C0CC8970D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -259,7 +259,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -322,26 +322,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 160D403727B34F0411BC79FF /* [CP] Check Pods Manifest.lock */ = { + 2B57C8696806073C0CC8970D /* [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-RunnerTests-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; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -382,24 +377,29 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 4338C53303986A87E9FC660D /* [CP] Embed Pods Frameworks */ = { + 3B26844C6DA47A5050EE7453 /* [CP] Check Pods Manifest.lock */ = { 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"; + 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-frameworks-${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-frameworks.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; }; - 6C684549A4B875261B12017F /* [CP] Check Pods Manifest.lock */ = { + 61510D7B8B6E676949967216 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -414,7 +414,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -472,7 +472,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D7B25570D85315AD001926AF /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = DED1A1BF8434CB19F3C04AD2 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -487,7 +487,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BC3B36EF588FC8D4C6D7BEC5 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 1C1825314C487936DFB88FA7 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -502,7 +502,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 59B41406B5664C42E55A4BCE /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 2A3D0323A2E654459C97A7A3 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/form_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/form_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5344e4113..5f438dedd 100644 --- a/form_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/form_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ // The value below is injected by flutter build, do not touch. - var serviceWorkerVersion = null; + const serviceWorkerVersion = null; diff --git a/form_app/windows/CMakeLists.txt b/form_app/windows/CMakeLists.txt index d03107443..2279a24a7 100644 --- a/form_app/windows/CMakeLists.txt +++ b/form_app/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "form_app") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/form_app/windows/runner/flutter_window.cpp b/form_app/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/form_app/windows/runner/flutter_window.cpp +++ b/form_app/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/game_template/lib/src/audio/audio_controller.dart b/game_template/lib/src/audio/audio_controller.dart index 52e718d61..6a02c0dbe 100644 --- a/game_template/lib/src/audio/audio_controller.dart +++ b/game_template/lib/src/audio/audio_controller.dart @@ -155,6 +155,7 @@ class AudioController { switch (_lifecycleNotifier!.value) { case AppLifecycleState.paused: case AppLifecycleState.detached: + case AppLifecycleState.hidden: _stopAllSound(); case AppLifecycleState.resumed: if (!_settings!.muted.value && _settings!.musicOn.value) { diff --git a/game_template/pubspec.yaml b/game_template/pubspec.yaml index 6c533f666..1abd49a92 100644 --- a/game_template/pubspec.yaml +++ b/game_template/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: 'none' version: 0.0.1+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/google_maps/pubspec.yaml b/google_maps/pubspec.yaml index 671704c9a..88402ccff 100644 --- a/google_maps/pubspec.yaml +++ b/google_maps/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/infinite_list/.metadata b/infinite_list/.metadata index e94891d5f..0e49e8aa9 100644 --- a/infinite_list/.metadata +++ b/infinite_list/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: web - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/infinite_list/android/app/build.gradle b/infinite_list/android/app/build.gradle index 68fbe5ecd..2bc213d1e 100644 --- a/infinite_list/android/app/build.gradle +++ b/infinite_list/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "dev.flutter.infinite_list" compileSdkVersion flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/infinite_list/android/settings.gradle b/infinite_list/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/infinite_list/android/settings.gradle +++ b/infinite_list/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/infinite_list/ios/Runner.xcodeproj/project.pbxproj b/infinite_list/ios/Runner.xcodeproj/project.pbxproj index a8ea2512c..879618b2b 100644 --- a/infinite_list/ios/Runner.xcodeproj/project.pbxproj +++ b/infinite_list/ios/Runner.xcodeproj/project.pbxproj @@ -8,14 +8,14 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 2BB8A62BAA8DE3888F66EC78 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 953318A36970BA8E78D4B99E /* Pods_Runner.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3BD7EE38351A89EB3ECD31E1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD9864D138FF13D6A9D201CA /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 7D2155DCF0134702A99C9BE9 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B562682621D07F57985280F /* Pods_RunnerTests.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 */; }; - A93125E8EAEFBFCCC1B5E6DB /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FD5722EDDF206A380D65507 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,19 +42,18 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0B4CFE3394B88A7C8EDC8556 /* 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 = ""; }; - 1881DCDF12F61AA0723CED8F /* 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 = ""; }; - 2A2873D898CC995369AC7E56 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 2D06EE645235E0EE1597DA65 /* 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 = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 465A665773B2F5FA22BC833A /* 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 = ""; }; - 5FD5722EDDF206A380D65507 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5B562682621D07F57985280F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.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 = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 89D5509C3AD84D1B306FA611 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 953318A36970BA8E78D4B99E /* 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; }; @@ -62,17 +61,18 @@ 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 = ""; }; - CD9864D138FF13D6A9D201CA /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F5A89AE0F30577EBC8FF2DA2 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - FC30FD821CEBFFB9DE2673EC /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A7FD2653B3CBF87F0D5B9E66 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + D3F87B8F06ECB4E019E33B57 /* 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 = ""; }; + E1ED3F9B5998FC14EF9508B1 /* 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 = ""; }; + EB8D9CE7B787C786AD1C7BB1 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 56A8898C5049774102776BB9 /* Frameworks */ = { + 5F865D7F4B990529C034514F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A93125E8EAEFBFCCC1B5E6DB /* Pods_RunnerTests.framework in Frameworks */, + 7D2155DCF0134702A99C9BE9 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -80,42 +80,33 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3BD7EE38351A89EB3ECD31E1 /* Pods_Runner.framework in Frameworks */, + 2BB8A62BAA8DE3888F66EC78 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 10A09CC1449A5AADA0BE434A /* Pods */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + 0B4CFE3394B88A7C8EDC8556 /* Pods-Runner.debug.xcconfig */, + E1ED3F9B5998FC14EF9508B1 /* Pods-Runner.release.xcconfig */, + D3F87B8F06ECB4E019E33B57 /* Pods-Runner.profile.xcconfig */, + A7FD2653B3CBF87F0D5B9E66 /* Pods-RunnerTests.debug.xcconfig */, + 89D5509C3AD84D1B306FA611 /* Pods-RunnerTests.release.xcconfig */, + EB8D9CE7B787C786AD1C7BB1 /* Pods-RunnerTests.profile.xcconfig */, ); - path = RunnerTests; - sourceTree = ""; - }; - 4C8DF92574DC0BF070A2E36F /* Frameworks */ = { - isa = PBXGroup; - children = ( - CD9864D138FF13D6A9D201CA /* Pods_Runner.framework */, - 5FD5722EDDF206A380D65507 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; - 85BFC43FF866076F7D0B8AB8 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( - 1881DCDF12F61AA0723CED8F /* Pods-Runner.debug.xcconfig */, - 465A665773B2F5FA22BC833A /* Pods-Runner.release.xcconfig */, - 2D06EE645235E0EE1597DA65 /* Pods-Runner.profile.xcconfig */, - 2A2873D898CC995369AC7E56 /* Pods-RunnerTests.debug.xcconfig */, - FC30FD821CEBFFB9DE2673EC /* Pods-RunnerTests.release.xcconfig */, - F5A89AE0F30577EBC8FF2DA2 /* Pods-RunnerTests.profile.xcconfig */, + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - name = Pods; - path = Pods; + path = RunnerTests; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 85BFC43FF866076F7D0B8AB8 /* Pods */, - 4C8DF92574DC0BF070A2E36F /* Frameworks */, + 10A09CC1449A5AADA0BE434A /* Pods */, + D4E5D12C9F4E6022F069D11E /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D4E5D12C9F4E6022F069D11E /* Frameworks */ = { + isa = PBXGroup; + children = ( + 953318A36970BA8E78D4B99E /* Pods_Runner.framework */, + 5B562682621D07F57985280F /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - C506153F0C25C861427E70EA /* [CP] Check Pods Manifest.lock */, + 88925AC925C78536E061EB2B /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - 56A8898C5049774102776BB9 /* Frameworks */, + 5F865D7F4B990529C034514F /* Frameworks */, ); buildRules = ( ); @@ -191,7 +191,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - BE08C67D16AFF522C50F951B /* [CP] Check Pods Manifest.lock */, + 6A58E13E4D1AE801A2F31E2F /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -214,7 +214,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { @@ -284,22 +285,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - 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"; - }; - BE08C67D16AFF522C50F951B /* [CP] Check Pods Manifest.lock */ = { + 6A58E13E4D1AE801A2F31E2F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -321,7 +307,7 @@ 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; }; - C506153F0C25C861427E70EA /* [CP] Check Pods Manifest.lock */ = { + 88925AC925C78536E061EB2B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -343,6 +329,21 @@ 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; + alwaysOutOfDate = 1; + 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 */ @@ -466,7 +467,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2A2873D898CC995369AC7E56 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = A7FD2653B3CBF87F0D5B9E66 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -484,7 +485,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FC30FD821CEBFFB9DE2673EC /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 89D5509C3AD84D1B306FA611 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -500,7 +501,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F5A89AE0F30577EBC8FF2DA2 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = EB8D9CE7B787C786AD1C7BB1 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/infinite_list/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/infinite_list/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e42adcb34..87131a09b 100644 --- a/infinite_list/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/infinite_list/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/infinite_list/macos/Runner.xcodeproj/project.pbxproj b/infinite_list/macos/Runner.xcodeproj/project.pbxproj index 2c15c3d12..1474f26c4 100644 --- a/infinite_list/macos/Runner.xcodeproj/project.pbxproj +++ b/infinite_list/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 1DA3417E74FC0C24636FAB0C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD4D2E94A96DAF0C82966E1 /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 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 */; }; - B8C56049C12850B0D1834894 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EB38035C17C681FBB2C7691 /* Pods_RunnerTests.framework */; }; + 643D267B000A6AC545A533D6 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ACC4D45023C3FECD5BD08B8F /* Pods_RunnerTests.framework */; }; + B324AF843383D88EC4A03FCD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CDBC119F49A25E33ED367F3 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,7 +62,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2EB38035C17C681FBB2C7691 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 14251B4ACB83942B99DED103 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 2F5ADCE104A5D3607ED34E6B /* 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 = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -79,15 +80,14 @@ 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 = ""; }; - 3911115C4A54C94F4381BDC9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 6FD4D2E94A96DAF0C82966E1 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 79BA605001F7043216F24381 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 3CDBC119F49A25E33ED367F3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6FD9E0E1C3F10D320F85B0CA /* 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 = ""; }; - C5E7FAB75F25509BB9C2DE85 /* 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 = ""; }; - C69B70E94C72AB55B779C55A /* 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 = ""; }; - EE03C42B643B75F439EFA44A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - FD5E459EBCA5BFE8424C6B0E /* 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 = ""; }; + ACC4D45023C3FECD5BD08B8F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AEC289693B9EC44329B52787 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + DA144AD7B57B6CF8C3C3CEE0 /* 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 = ""; }; + E510B86E056DDAEBD28FB94A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B8C56049C12850B0D1834894 /* Pods_RunnerTests.framework in Frameworks */, + 643D267B000A6AC545A533D6 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1DA3417E74FC0C24636FAB0C /* Pods_Runner.framework in Frameworks */, + B324AF843383D88EC4A03FCD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 811658F208C0B2D91B38123D /* Pods */, + DFB277CE173E39F31D4E8DE2 /* Pods */, ); sourceTree = ""; }; @@ -185,27 +185,27 @@ path = Runner; sourceTree = ""; }; - 811658F208C0B2D91B38123D /* Pods */ = { + D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - FD5E459EBCA5BFE8424C6B0E /* Pods-Runner.debug.xcconfig */, - C5E7FAB75F25509BB9C2DE85 /* Pods-Runner.release.xcconfig */, - C69B70E94C72AB55B779C55A /* Pods-Runner.profile.xcconfig */, - EE03C42B643B75F439EFA44A /* Pods-RunnerTests.debug.xcconfig */, - 3911115C4A54C94F4381BDC9 /* Pods-RunnerTests.release.xcconfig */, - 79BA605001F7043216F24381 /* Pods-RunnerTests.profile.xcconfig */, + 3CDBC119F49A25E33ED367F3 /* Pods_Runner.framework */, + ACC4D45023C3FECD5BD08B8F /* Pods_RunnerTests.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { + DFB277CE173E39F31D4E8DE2 /* Pods */ = { isa = PBXGroup; children = ( - 6FD4D2E94A96DAF0C82966E1 /* Pods_Runner.framework */, - 2EB38035C17C681FBB2C7691 /* Pods_RunnerTests.framework */, + DA144AD7B57B6CF8C3C3CEE0 /* Pods-Runner.debug.xcconfig */, + 6FD9E0E1C3F10D320F85B0CA /* Pods-Runner.release.xcconfig */, + 2F5ADCE104A5D3607ED34E6B /* Pods-Runner.profile.xcconfig */, + E510B86E056DDAEBD28FB94A /* Pods-RunnerTests.debug.xcconfig */, + AEC289693B9EC44329B52787 /* Pods-RunnerTests.release.xcconfig */, + 14251B4ACB83942B99DED103 /* Pods-RunnerTests.profile.xcconfig */, ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; /* End PBXGroup section */ @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 6A8AE041496AEDE5328D54D8 /* [CP] Check Pods Manifest.lock */, + D849368198132FA5082B7D86 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - B3AC39D68BEAAC545E6C26D6 /* [CP] Check Pods Manifest.lock */, + A7D7CE2C1BBB58B92486BD27 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 2DB27804F3E9EB9A761C2C86 /* [CP] Embed Pods Frameworks */, + 3EABA583CEF57BDF637AE8EA /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -259,7 +259,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -322,23 +322,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2DB27804F3E9EB9A761C2C86 /* [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; alwaysOutOfDate = 1; @@ -377,7 +360,24 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 6A8AE041496AEDE5328D54D8 /* [CP] Check Pods Manifest.lock */ = { + 3EABA583CEF57BDF637AE8EA /* [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; + }; + A7D7CE2C1BBB58B92486BD27 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -392,14 +392,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "$(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; }; - B3AC39D68BEAAC545E6C26D6 /* [CP] Check Pods Manifest.lock */ = { + D849368198132FA5082B7D86 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -414,7 +414,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -472,7 +472,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EE03C42B643B75F439EFA44A /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = E510B86E056DDAEBD28FB94A /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -487,7 +487,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3911115C4A54C94F4381BDC9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = AEC289693B9EC44329B52787 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -502,7 +502,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 79BA605001F7043216F24381 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 14251B4ACB83942B99DED103 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/infinite_list/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/infinite_list/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 74783a4e8..969f86c83 100644 --- a/infinite_list/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/infinite_list/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ // The value below is injected by flutter build, do not touch. - var serviceWorkerVersion = null; + const serviceWorkerVersion = null; diff --git a/infinite_list/windows/CMakeLists.txt b/infinite_list/windows/CMakeLists.txt index 829bfca54..8334e0312 100644 --- a/infinite_list/windows/CMakeLists.txt +++ b/infinite_list/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "infinite_list") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/infinite_list/windows/runner/flutter_window.cpp b/infinite_list/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/infinite_list/windows/runner/flutter_window.cpp +++ b/infinite_list/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/ios_app_clip/pubspec.yaml b/ios_app_clip/pubspec.yaml index 80adae272..d9d1b3df8 100644 --- a/ios_app_clip/pubspec.yaml +++ b/ios_app_clip/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/isolate_example/.metadata b/isolate_example/.metadata index bc53795ac..71d214376 100644 --- a/isolate_example/.metadata +++ b/isolate_example/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - channel: beta + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,23 +13,23 @@ project_type: app migration: platforms: - platform: root - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/isolate_example/android/app/build.gradle b/isolate_example/android/app/build.gradle index 7189d2b9d..4c17dedd0 100644 --- a/isolate_example/android/app/build.gradle +++ b/isolate_example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,11 +22,8 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { + namespace "dev.flutter.isolate_example" compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -66,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/isolate_example/android/app/src/debug/AndroidManifest.xml b/isolate_example/android/app/src/debug/AndroidManifest.xml index 0d6a1d9d1..399f6981d 100644 --- a/isolate_example/android/app/src/debug/AndroidManifest.xml +++ b/isolate_example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/jsonexample/windows/CMakeLists.txt b/jsonexample/windows/CMakeLists.txt index d94a5c652..418182ee9 100644 --- a/jsonexample/windows/CMakeLists.txt +++ b/jsonexample/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "jsonexample") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/jsonexample/windows/runner/flutter_window.cpp b/jsonexample/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/jsonexample/windows/runner/flutter_window.cpp +++ b/jsonexample/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/material_3_demo/pubspec.yaml b/material_3_demo/pubspec.yaml index 4bf2d0473..57105401f 100644 --- a/material_3_demo/pubspec.yaml +++ b/material_3_demo/pubspec.yaml @@ -8,7 +8,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/navigation_and_routing/.metadata b/navigation_and_routing/.metadata index e94891d5f..0e49e8aa9 100644 --- a/navigation_and_routing/.metadata +++ b/navigation_and_routing/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: web - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/navigation_and_routing/android/app/build.gradle b/navigation_and_routing/android/app/build.gradle index b023667bd..ad0c90590 100644 --- a/navigation_and_routing/android/app/build.gradle +++ b/navigation_and_routing/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "dev.flutter.navigation_and_routing" compileSdkVersion flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/navigation_and_routing/android/settings.gradle b/navigation_and_routing/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/navigation_and_routing/android/settings.gradle +++ b/navigation_and_routing/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj b/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj index 0a79e58d6..b7cc6b574 100644 --- a/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj +++ b/navigation_and_routing/ios/Runner.xcodeproj/project.pbxproj @@ -168,7 +168,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { diff --git a/navigation_and_routing/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/navigation_and_routing/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e42adcb34..87131a09b 100644 --- a/navigation_and_routing/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/navigation_and_routing/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/navigation_and_routing/lib/src/routing/parser.dart b/navigation_and_routing/lib/src/routing/parser.dart index 0c57d5dc6..00c0757ff 100644 --- a/navigation_and_routing/lib/src/routing/parser.dart +++ b/navigation_and_routing/lib/src/routing/parser.dart @@ -35,8 +35,9 @@ class TemplateRouteParser extends RouteInformationParser { Future parseRouteInformation( RouteInformation routeInformation, ) async { - final path = routeInformation.location!; - final queryParams = Uri.parse(path).queryParameters; + final uri = routeInformation.uri; + final path = uri.toString(); + final queryParams = uri.queryParameters; var parsedRoute = initialRoute; for (var pathTemplate in _pathTemplates) { @@ -61,5 +62,5 @@ class TemplateRouteParser extends RouteInformationParser { @override RouteInformation restoreRouteInformation(ParsedRoute configuration) => - RouteInformation(location: configuration.path); + RouteInformation(uri: Uri.parse(configuration.path)); } diff --git a/navigation_and_routing/lib/src/routing/route_state.dart b/navigation_and_routing/lib/src/routing/route_state.dart index 56a10d091..aa7e1adc8 100644 --- a/navigation_and_routing/lib/src/routing/route_state.dart +++ b/navigation_and_routing/lib/src/routing/route_state.dart @@ -30,8 +30,8 @@ class RouteState extends ChangeNotifier { } Future go(String route) async { - this.route = - await _parser.parseRouteInformation(RouteInformation(location: route)); + this.route = await _parser + .parseRouteInformation(RouteInformation(uri: Uri.parse(route))); } } diff --git a/navigation_and_routing/macos/Runner.xcodeproj/project.pbxproj b/navigation_and_routing/macos/Runner.xcodeproj/project.pbxproj index 38776fe86..1220eab4c 100644 --- a/navigation_and_routing/macos/Runner.xcodeproj/project.pbxproj +++ b/navigation_and_routing/macos/Runner.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/navigation_and_routing/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/navigation_and_routing/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 132d114e6..025d0cec1 100644 --- a/navigation_and_routing/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/navigation_and_routing/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ // The value below is injected by flutter build, do not touch. - var serviceWorkerVersion = null; + const serviceWorkerVersion = null; diff --git a/navigation_and_routing/windows/CMakeLists.txt b/navigation_and_routing/windows/CMakeLists.txt index 5e9678003..b17291fad 100644 --- a/navigation_and_routing/windows/CMakeLists.txt +++ b/navigation_and_routing/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "navigation_and_routing") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/navigation_and_routing/windows/runner/flutter_window.cpp b/navigation_and_routing/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/navigation_and_routing/windows/runner/flutter_window.cpp +++ b/navigation_and_routing/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/next_gen_ui_demo/pubspec.yaml b/next_gen_ui_demo/pubspec.yaml index a2c7f0fb2..39a7d54b0 100644 --- a/next_gen_ui_demo/pubspec.yaml +++ b/next_gen_ui_demo/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: cupertino_icons: ^1.0.5 diff --git a/place_tracker/.metadata b/place_tracker/.metadata index d44324b85..bcb2239a2 100644 --- a/place_tracker/.metadata +++ b/place_tracker/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,17 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: web - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/place_tracker/android/app/build.gradle b/place_tracker/android/app/build.gradle index 0d87b80ea..6249885b2 100644 --- a/place_tracker/android/app/build.gradle +++ b/place_tracker/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "dev.flutter.place_tracker" compileSdkVersion flutter.compileSdkVersion @@ -66,6 +63,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/place_tracker/android/settings.gradle b/place_tracker/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/place_tracker/android/settings.gradle +++ b/place_tracker/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/place_tracker/codelab_rebuild.yaml b/place_tracker/codelab_rebuild.yaml index a896bf16d..a392dcee6 100644 --- a/place_tracker/codelab_rebuild.yaml +++ b/place_tracker/codelab_rebuild.yaml @@ -18,7 +18,7 @@ steps: patch-u: | --- b/place_tracker/android/app/build.gradle +++ a/place_tracker/android/app/build.gradle - @@ -46,9 +46,8 @@ android { + @@ -43,9 +43,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "dev.flutter.place_tracker" @@ -108,7 +108,7 @@ steps: + diff --git a/platform_channels/.metadata b/platform_channels/.metadata index 5a943313c..146b8b6c8 100644 --- a/platform_channels/.metadata +++ b/platform_channels/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - channel: beta + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,14 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 - base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/platform_channels/android/app/build.gradle b/platform_channels/android/app/build.gradle index 13205644d..bebc96d32 100644 --- a/platform_channels/android/app/build.gradle +++ b/platform_channels/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,11 +22,8 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { + namespace "dev.flutter.platform_channels" compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -67,6 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.google.code.gson:gson:2.8.6' } diff --git a/platform_channels/android/app/src/debug/AndroidManifest.xml b/platform_channels/android/app/src/debug/AndroidManifest.xml index 9a192138a..399f6981d 100644 --- a/platform_channels/android/app/src/debug/AndroidManifest.xml +++ b/platform_channels/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/platform_view_swift/pubspec.yaml b/platform_view_swift/pubspec.yaml index edd162676..ba64f410a 100644 --- a/platform_view_swift/pubspec.yaml +++ b/platform_view_swift/pubspec.yaml @@ -4,7 +4,7 @@ description: A new Flutter project. version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/provider_counter/pubspec.yaml b/provider_counter/pubspec.yaml index 8bb212f68..743be95ad 100644 --- a/provider_counter/pubspec.yaml +++ b/provider_counter/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none version: 1.0.0 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/provider_shopper/.metadata b/provider_shopper/.metadata index e94891d5f..0e49e8aa9 100644 --- a/provider_shopper/.metadata +++ b/provider_shopper/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - channel: stable + revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" + channel: "beta" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: android - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: ios - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: linux - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: macos - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: web - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - platform: windows - create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 # User provided section diff --git a/provider_shopper/android/app/build.gradle b/provider_shopper/android/app/build.gradle index a916f294e..dcaf37fd8 100644 --- a/provider_shopper/android/app/build.gradle +++ b/provider_shopper/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace "dev.flutter.provider_shopper" compileSdkVersion flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/provider_shopper/android/settings.gradle b/provider_shopper/android/settings.gradle index 44e62bcf0..55c4ca8b1 100644 --- a/provider_shopper/android/settings.gradle +++ b/provider_shopper/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/provider_shopper/ios/Runner.xcodeproj/project.pbxproj b/provider_shopper/ios/Runner.xcodeproj/project.pbxproj index 8b269ada4..99c198d9e 100644 --- a/provider_shopper/ios/Runner.xcodeproj/project.pbxproj +++ b/provider_shopper/ios/Runner.xcodeproj/project.pbxproj @@ -11,11 +11,11 @@ 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 7A6751AB08714F71FB281223 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7C74AC008638DA026746D98 /* Pods_RunnerTests.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 */; }; - C4A8C540CA997D726FE1E3B1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF8BFA994632D4CD98980446 /* Pods_Runner.framework */; }; + C81CBF76E6179173B28AC625 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4B0E14729D13C60C3BD6253 /* Pods_Runner.framework */; }; + E6218B4FDEFB7A84EAB62FEF /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D51B5DD5042EB1DFE7384CAA /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,15 +42,15 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 05C441C7B62F966650B93C1D /* 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 = ""; }; + 024AD0C237FE44072D31640D /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.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 = ""; }; - 2BC8BF5AA2B87BB7E3F118B1 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1D135EB128F87F0DBFC240C7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 29EA5DDCFD3183C0BC215AC9 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 389B6B8CAB8B05503108DAAE /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 5934E2258309FF881499E2A8 /* 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 = ""; }; + 533CFDB3F7D1474DED110153 /* 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 = ""; }; @@ -61,26 +61,26 @@ 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 = ""; }; - A7C9F94621991E27B42EF615 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - A964611FD7E41B0DC224452E /* 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 = ""; }; - C7C74AC008638DA026746D98 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EF8BFA994632D4CD98980446 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BF7AC239F1CCD808E824EE82 /* 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 = ""; }; + D51B5DD5042EB1DFE7384CAA /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D75D42BB4F1DF06C74DF99E0 /* 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 = ""; }; + F4B0E14729D13C60C3BD6253 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 7B68A208DB986B6105BCF3EC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7A6751AB08714F71FB281223 /* Pods_RunnerTests.framework in Frameworks */, + C81CBF76E6179173B28AC625 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 97C146EB1CF9000F007C117D /* Frameworks */ = { + A036CACCB20301884FCC5860 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C4A8C540CA997D726FE1E3B1 /* Pods_Runner.framework in Frameworks */, + E6218B4FDEFB7A84EAB62FEF /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -95,29 +95,15 @@ path = RunnerTests; sourceTree = ""; }; - 559951FA0EF5B79103A651A4 /* Frameworks */ = { + 3CCC50677E1A79F6CC3FF313 /* Frameworks */ = { isa = PBXGroup; children = ( - EF8BFA994632D4CD98980446 /* Pods_Runner.framework */, - C7C74AC008638DA026746D98 /* Pods_RunnerTests.framework */, + F4B0E14729D13C60C3BD6253 /* Pods_Runner.framework */, + D51B5DD5042EB1DFE7384CAA /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; }; - 58D1BCEEF715B09AE65630A8 /* Pods */ = { - isa = PBXGroup; - children = ( - 05C441C7B62F966650B93C1D /* Pods-Runner.debug.xcconfig */, - 5934E2258309FF881499E2A8 /* Pods-Runner.release.xcconfig */, - A964611FD7E41B0DC224452E /* Pods-Runner.profile.xcconfig */, - A7C9F94621991E27B42EF615 /* Pods-RunnerTests.debug.xcconfig */, - 2BC8BF5AA2B87BB7E3F118B1 /* Pods-RunnerTests.release.xcconfig */, - 389B6B8CAB8B05503108DAAE /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +122,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 58D1BCEEF715B09AE65630A8 /* Pods */, - 559951FA0EF5B79103A651A4 /* Frameworks */, + DBB9C4F1F9017465A0B72542 /* Pods */, + 3CCC50677E1A79F6CC3FF313 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +151,20 @@ path = Runner; sourceTree = ""; }; + DBB9C4F1F9017465A0B72542 /* Pods */ = { + isa = PBXGroup; + children = ( + D75D42BB4F1DF06C74DF99E0 /* Pods-Runner.debug.xcconfig */, + 533CFDB3F7D1474DED110153 /* Pods-Runner.release.xcconfig */, + BF7AC239F1CCD808E824EE82 /* Pods-Runner.profile.xcconfig */, + 024AD0C237FE44072D31640D /* Pods-RunnerTests.debug.xcconfig */, + 1D135EB128F87F0DBFC240C7 /* Pods-RunnerTests.release.xcconfig */, + 29EA5DDCFD3183C0BC215AC9 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - B5110D84881AFEDA2DC2FEBE /* [CP] Check Pods Manifest.lock */, + 604726BAC111981C368B2140 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - 7B68A208DB986B6105BCF3EC /* Frameworks */, + A036CACCB20301884FCC5860 /* Frameworks */, ); buildRules = ( ); @@ -191,7 +191,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 05858AC932335684BBE862E8 /* [CP] Check Pods Manifest.lock */, + C9CA877DD10BE021E5901045 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -214,7 +214,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { @@ -268,43 +269,43 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 05858AC932335684BBE862E8 /* [CP] Check Pods Manifest.lock */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); + 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"; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 604726BAC111981C368B2140 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + "${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-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + 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; @@ -321,7 +322,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - B5110D84881AFEDA2DC2FEBE /* [CP] Check Pods Manifest.lock */ = { + C9CA877DD10BE021E5901045 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -336,7 +337,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -466,7 +467,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A7C9F94621991E27B42EF615 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 024AD0C237FE44072D31640D /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -484,7 +485,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2BC8BF5AA2B87BB7E3F118B1 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 1D135EB128F87F0DBFC240C7 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -500,7 +501,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 389B6B8CAB8B05503108DAAE /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 29EA5DDCFD3183C0BC215AC9 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/provider_shopper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/provider_shopper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e42adcb34..87131a09b 100644 --- a/provider_shopper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/provider_shopper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/provider_shopper/macos/Runner.xcodeproj/project.pbxproj b/provider_shopper/macos/Runner.xcodeproj/project.pbxproj index 5e80d1612..f88b5e3af 100644 --- a/provider_shopper/macos/Runner.xcodeproj/project.pbxproj +++ b/provider_shopper/macos/Runner.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/provider_shopper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/provider_shopper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a101614e7..dd1964644 100644 --- a/provider_shopper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/provider_shopper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ // The value below is injected by flutter build, do not touch. - var serviceWorkerVersion = null; + const serviceWorkerVersion = null; diff --git a/provider_shopper/windows/CMakeLists.txt b/provider_shopper/windows/CMakeLists.txt index 55936180a..48727c5bd 100644 --- a/provider_shopper/windows/CMakeLists.txt +++ b/provider_shopper/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "provider_shopper") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/provider_shopper/windows/runner/flutter_window.cpp b/provider_shopper/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/provider_shopper/windows/runner/flutter_window.cpp +++ b/provider_shopper/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/simple_shader/pubspec.yaml b/simple_shader/pubspec.yaml index 0be463537..eb1972672 100644 --- a/simple_shader/pubspec.yaml +++ b/simple_shader/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/simplistic_calculator/pubspec.yaml b/simplistic_calculator/pubspec.yaml index 327c2411f..1db66c623 100644 --- a/simplistic_calculator/pubspec.yaml +++ b/simplistic_calculator/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: auto_size_text: ^3.0.0 diff --git a/simplistic_editor/lib/basic_text_field.dart b/simplistic_editor/lib/basic_text_field.dart index e2c2ea409..60ccd1659 100644 --- a/simplistic_editor/lib/basic_text_field.dart +++ b/simplistic_editor/lib/basic_text_field.dart @@ -26,6 +26,7 @@ class BasicTextField extends StatefulWidget { VoidCallback? onCut, VoidCallback? onPaste, VoidCallback? onSelectAll, + VoidCallback? onLiveTextInput, TextSelectionToolbarAnchors anchors, ) { return AdaptiveTextSelectionToolbar.editable( @@ -34,6 +35,7 @@ class BasicTextField extends StatefulWidget { onCut: onCut, onPaste: onPaste, onSelectAll: onSelectAll, + onLiveTextInput: onLiveTextInput, anchors: anchors, ); } diff --git a/simplistic_editor/lib/basic_text_input_client.dart b/simplistic_editor/lib/basic_text_input_client.dart index 4605c783a..c671a4dac 100644 --- a/simplistic_editor/lib/basic_text_input_client.dart +++ b/simplistic_editor/lib/basic_text_input_client.dart @@ -24,6 +24,7 @@ typedef BasicTextFieldContextMenuBuilder = Widget Function( VoidCallback? onCut, VoidCallback? onPaste, VoidCallback? onSelectAll, + VoidCallback? onLiveTextInput, TextSelectionToolbarAnchors anchors, ); @@ -65,6 +66,7 @@ class BasicTextInputClientState extends State void initState() { super.initState(); _clipboardStatus?.addListener(_onChangedClipboardStatus); + _liveTextInputStatus?.addListener(_onChangedLiveTextInputStatus); widget.focusNode.addListener(_handleFocusChanged); widget.controller.addListener(_didChangeTextEditingValue); } @@ -78,6 +80,9 @@ class BasicTextInputClientState extends State @override void dispose() { widget.controller.removeListener(_didChangeTextEditingValue); + widget.focusNode.removeListener(_handleFocusChanged); + _liveTextInputStatus?.removeListener(_onChangedLiveTextInputStatus); + _liveTextInputStatus?.dispose(); _clipboardStatus?.removeListener(_onChangedClipboardStatus); _clipboardStatus?.dispose(); super.dispose(); @@ -157,6 +162,7 @@ class BasicTextInputClientState extends State return false; } + _liveTextInputStatus?.update(); _selectionOverlay!.showToolbar(); return true; @@ -854,6 +860,9 @@ class BasicTextInputClientState extends State selectAllEnabled ? () => selectAll(SelectionChangedCause.toolbar) : null, + liveTextInputEnabled + ? () => _startLiveTextInput(SelectionChangedCause.toolbar) + : null, _contextMenuAnchors, ); }, @@ -950,6 +959,35 @@ class BasicTextInputClientState extends State ); } + /// For OCR Support. + /// Detects whether the Live Text input is enabled. + final LiveTextInputStatusNotifier? _liveTextInputStatus = + kIsWeb ? null : LiveTextInputStatusNotifier(); + + @override + bool get liveTextInputEnabled { + return _liveTextInputStatus?.value == LiveTextInputStatus.enabled && + textEditingValue.selection.isCollapsed; + } + + void _onChangedLiveTextInputStatus() { + setState(() { + // Inform the widget that the value of liveTextInputStatus has changed. + }); + } + + void _startLiveTextInput(SelectionChangedCause cause) { + if (!liveTextInputEnabled) { + return; + } + if (_hasInputConnection) { + LiveText.startLiveTextInput(); + } + if (cause == SelectionChangedCause.toolbar) { + hideToolbar(); + } + } + @override Widget build(BuildContext context) { return Actions( diff --git a/simplistic_editor/pubspec.yaml b/simplistic_editor/pubspec.yaml index 16d26876f..c9badcc13 100644 --- a/simplistic_editor/pubspec.yaml +++ b/simplistic_editor/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/testing_app/pubspec.yaml b/testing_app/pubspec.yaml index 88f41f265..2b35c8c01 100644 --- a/testing_app/pubspec.yaml +++ b/testing_app/pubspec.yaml @@ -4,7 +4,7 @@ description: A sample that shows testing in Flutter. version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index 9cca350c0..2c3f54663 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -22,11 +22,9 @@ declare -ar PROJECT_NAMES=( "code_sharing/server" "code_sharing/shared" "deeplink_store_example" - # TODO(DomesticMouse): Dependency 'fluent_ui' fails to compile. https://github.com/bdlukaa/fluent_ui/issues/865 - # "desktop_photo_search/fluent_ui" + "desktop_photo_search/fluent_ui" "desktop_photo_search/material" - # TODO(DomesticMouse): The function can't be unconditionally invoked because it can be 'null'. - # "experimental/context_menus" + "experimental/context_menus" "experimental/federated_plugin/federated_plugin" "experimental/federated_plugin/federated_plugin/example" "experimental/federated_plugin/federated_plugin_macos" @@ -35,24 +33,20 @@ declare -ar PROJECT_NAMES=( "experimental/federated_plugin/federated_plugin_windows" "experimental/linting_tool" "experimental/material_3_demo" - # TODO(DomesticMouse): dart format required - # "experimental/pedometer" - # TODO(DomesticMouse): dart format required - # "experimental/pedometer/example" + "experimental/pedometer" + "experimental/pedometer/example" "experimental/varfont_shader_puzzle" "experimental/web_dashboard" "flutter_maps_firestore" "form_app" - # TODO(DomesticMouse): The type 'AppLifecycleState' is not exhaustively matched by the switch cases since it doesn't match 'AppLifecycleState.hidden'. - # "game_template" + "game_template" "google_maps" "infinite_list" "ios_app_clip" "isolate_example" "jsonexample" "material_3_demo" - # TODO(DomesticMouse): The '!' will have no effect because the receiver can't be null. - # "navigation_and_routing" + "navigation_and_routing" "next_gen_ui_demo" "place_tracker" "platform_channels" @@ -62,8 +56,7 @@ declare -ar PROJECT_NAMES=( "provider_shopper" "simple_shader" "simplistic_calculator" - # TODO(DomesticMouse): The named parameter 'onLiveTextInput' is required, but there's no corresponding argument. - # "simplistic_editor" + "simplistic_editor" "testing_app" "veggieseasons" "web_embedding/element_embedding_demo" diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh index 4bdaeb903..1353afe77 100755 --- a/tool/flutter_ci_script_master.sh +++ b/tool/flutter_ci_script_master.sh @@ -23,10 +23,9 @@ declare -ar PROJECT_NAMES=( "code_sharing/server" "code_sharing/shared" "deeplink_store_example" - # TODO(DomesticMouse): Dependency 'fluent_ui' fails to compile. https://github.com/bdlukaa/fluent_ui/issues/865 - # "desktop_photo_search/fluent_ui" + "desktop_photo_search/fluent_ui" "desktop_photo_search/material" - # TODO(DomesticMouse): The function can't be unconditionally invoked because it can be 'null'. + # TODO(DomesticMouse): Context Menu tests are flaky? # "experimental/context_menus" "experimental/federated_plugin/federated_plugin" "experimental/federated_plugin/federated_plugin/example" @@ -36,24 +35,21 @@ declare -ar PROJECT_NAMES=( "experimental/federated_plugin/federated_plugin_windows" "experimental/linting_tool" "experimental/material_3_demo" - # TODO(DomesticMouse): dart format required - # "experimental/pedometer" - # TODO(DomesticMouse): dart format required - # "experimental/pedometer/example" + "experimental/pedometer" + "experimental/pedometer/example" "experimental/varfont_shader_puzzle" "experimental/web_dashboard" "flutter_maps_firestore" "form_app" - # TODO(DomesticMouse): The type 'AppLifecycleState' is not exhaustively matched by the switch cases since it doesn't match 'AppLifecycleState.hidden'. - # "game_template" + "game_template" "google_maps" "infinite_list" "ios_app_clip" "isolate_example" - # TODO(DomesticMouse: ComplexObjectView widget test Typical object is displayed correctly + # TODO(DomesticMouse): ComplexObjectView widget test Typical object is displayed correctly # "jsonexample" "material_3_demo" - # TODO(DomesticMouse): The '!' will have no effect because the receiver can't be null. + # TODO(DomesticMouse): Use 'const' with the constructor to improve performance. # "navigation_and_routing" "next_gen_ui_demo" "place_tracker" @@ -63,8 +59,9 @@ declare -ar PROJECT_NAMES=( "provider_counter" "provider_shopper" "simple_shader" - "simplistic_calculator" - # TODO(DomesticMouse): The named parameter 'onLiveTextInput' is required, but there's no corresponding argument. + # TODO(DomesticMouse): Inferred type argument 'AutoPlacement' doesn't conform to the bound 'Enum?' of the type variable 'T' on 'EnumProperty'. + # "simplistic_calculator" + # TODO(DomesticMouse): The named parameter 'onLookUp' is required # "simplistic_editor" "testing_app" "veggieseasons" diff --git a/veggieseasons/pubspec.yaml b/veggieseasons/pubspec.yaml index eabec01fa..32a65f40c 100644 --- a/veggieseasons/pubspec.yaml +++ b/veggieseasons/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none version: 1.2.0 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: flutter: diff --git a/web/_tool/pubspec.yaml b/web/_tool/pubspec.yaml index eeca5784b..100da4267 100644 --- a/web/_tool/pubspec.yaml +++ b/web/_tool/pubspec.yaml @@ -2,7 +2,7 @@ name: tool publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: markdown: ^7.0.0 diff --git a/web/samples_index/pubspec.yaml b/web/samples_index/pubspec.yaml index c35cf06fd..bd5ba819d 100644 --- a/web/samples_index/pubspec.yaml +++ b/web/samples_index/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/flutter/samples/tree/main/web/samples_index version: 0.0.1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: json_annotation: ^4.8.1 diff --git a/web_embedding/element_embedding_demo/pubspec.yaml b/web_embedding/element_embedding_demo/pubspec.yaml index 9bbac4ef1..3f5beb3c9 100644 --- a/web_embedding/element_embedding_demo/pubspec.yaml +++ b/web_embedding/element_embedding_demo/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.0.0 + sdk: ^3.1.0-0 dependencies: cupertino_icons: ^1.0.2