diff --git a/dev/devicelab/bin/tasks/hot_mode_dev_cycle_macos_target__benchmark.dart b/dev/devicelab/bin/tasks/hot_mode_dev_cycle_macos_target__benchmark.dart index 25e4f4d5c16..2a8f706bbf9 100644 --- a/dev/devicelab/bin/tasks/hot_mode_dev_cycle_macos_target__benchmark.dart +++ b/dev/devicelab/bin/tasks/hot_mode_dev_cycle_macos_target__benchmark.dart @@ -6,5 +6,5 @@ import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/hot_mode_tests.dart'; Future main() async { - await task(createHotModeTest(deviceIdOverride: 'macos')); + await task(createHotModeTest(deviceIdOverride: 'macos', checkAppRunningOnLocalDevice: true)); } diff --git a/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/project.pbxproj index e0bd8ac8389..c3c064de83f 100644 --- a/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/project.pbxproj @@ -67,7 +67,7 @@ 31E9DDB21E0B961FFC0E8ADA /* 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 = ""; }; 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 /* flutter_gallery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flutter_gallery.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* Flutter Gallery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Flutter Gallery.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 = ""; }; @@ -136,7 +136,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* flutter_gallery.app */, + 33CC10ED2044A3C60003C045 /* Flutter Gallery.app */, F7BDBB0B26E829B700DE9315 /* RunnerTests.xctest */, ); name = Products; @@ -229,7 +229,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* flutter_gallery.app */; + productReference = 33CC10ED2044A3C60003C045 /* Flutter Gallery.app */; productType = "com.apple.product-type.application"; }; F7BDBB0A26E829B700DE9315 /* RunnerTests */ = { @@ -712,7 +712,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterGallery.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_gallery.app/Contents/MacOS/flutter_gallery"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Flutter Gallery.app/Contents/MacOS/Flutter Gallery"; }; name = Debug; }; @@ -732,7 +732,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterGallery.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_gallery.app/Contents/MacOS/flutter_gallery"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Flutter Gallery.app/Contents/MacOS/Flutter Gallery"; }; name = Release; }; @@ -752,7 +752,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterGallery.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_gallery.app/Contents/MacOS/flutter_gallery"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Flutter Gallery.app/Contents/MacOS/Flutter Gallery"; }; name = Profile; }; diff --git a/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 79c57269abd..91a6ddc2621 100644 --- a/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/dev/integration_tests/flutter_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -64,7 +64,7 @@ @@ -81,7 +81,7 @@ diff --git a/dev/integration_tests/flutter_gallery/macos/Runner/Configs/AppInfo.xcconfig b/dev/integration_tests/flutter_gallery/macos/Runner/Configs/AppInfo.xcconfig index e10b69ec1e9..b13c547d446 100644 --- a/dev/integration_tests/flutter_gallery/macos/Runner/Configs/AppInfo.xcconfig +++ b/dev/integration_tests/flutter_gallery/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = flutter_gallery +PRODUCT_NAME = Flutter Gallery // The application's bundle identifier PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterGallery // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2019 com.example. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2014 The Flutter Authors. All rights reserved. diff --git a/dev/integration_tests/flutter_gallery/macos/RunnerTests/RunnerTests.m b/dev/integration_tests/flutter_gallery/macos/RunnerTests/RunnerTests.m index 80dba8485a5..d18fbbdbf4d 100644 --- a/dev/integration_tests/flutter_gallery/macos/RunnerTests/RunnerTests.m +++ b/dev/integration_tests/flutter_gallery/macos/RunnerTests/RunnerTests.m @@ -13,7 +13,7 @@ - (void)testMenu { NSMenu *applicationMenu = ((FlutterAppDelegate *)NSApplication.sharedApplication.delegate).applicationMenu; XCTAssertEqual(applicationMenu.numberOfItems, 11); - XCTAssertEqualObjects([applicationMenu itemAtIndex:0].title, @"About flutter_gallery"); + XCTAssertEqualObjects([applicationMenu itemAtIndex:0].title, @"About Flutter Gallery"); NSMenu *mainMenu = NSApplication.sharedApplication.mainMenu; XCTAssertEqual([mainMenu indexOfItemWithSubmenu:applicationMenu], 0); diff --git a/packages/flutter_tools/test/host_cross_arch.shard/macos_content_validation_test.dart b/packages/flutter_tools/test/host_cross_arch.shard/macos_content_validation_test.dart index cfa61f72dab..5bfa8ac987e 100644 --- a/packages/flutter_tools/test/host_cross_arch.shard/macos_content_validation_test.dart +++ b/packages/flutter_tools/test/host_cross_arch.shard/macos_content_validation_test.dart @@ -77,7 +77,7 @@ void main() { buildMode, )); - final Directory outputApp = buildPath.childDirectory('flutter_gallery.app'); + final Directory outputApp = buildPath.childDirectory('Flutter Gallery.app'); final Directory outputAppFramework = fileSystem.directory(fileSystem.path.join( outputApp.path,