From 801fc4bf4777d070b67e6f3d524da007dd9d12de Mon Sep 17 00:00:00 2001 From: a-wallen Date: Thu, 15 Dec 2022 18:15:43 -0800 Subject: [PATCH 01/15] Add new macos target configured for flavors --- .../flavors/macos/.gitignore | 7 + .../macos/Flutter/Flutter-Debug.xcconfig | 2 + .../macos/Flutter/Flutter-Release.xcconfig | 2 + .../flavors/macos/Free App copy-Info.plist | 34 + .../macos/Paid AppDebug Free.entitlements | 12 + dev/integration_tests/flavors/macos/Podfile | 42 + .../macos/Runner.xcodeproj/project.pbxproj | 947 ++++++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/free.xcscheme | 87 ++ .../xcshareddata/xcschemes/paid.xcscheme | 78 ++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../flavors/macos/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 68 ++ .../macos/Runner/Base.lproj/MainMenu.xib | 343 +++++++ .../macos/Runner/Configs/AppInfo.xcconfig | 14 + .../macos/Runner/Configs/Debug.xcconfig | 4 + .../macos/Runner/Configs/Generated.xcconfig | 0 .../macos/Runner/Configs/Release.xcconfig | 4 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 12 + .../flavors/macos/Runner/Info.plist | 34 + .../macos/Runner/MainFlutterWindow.swift | 31 + .../flavors/macos/Runner/Release.entitlements | 8 + 24 files changed, 1781 insertions(+) create mode 100644 dev/integration_tests/flavors/macos/.gitignore create mode 100644 dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Free App copy-Info.plist create mode 100644 dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements create mode 100644 dev/integration_tests/flavors/macos/Podfile create mode 100644 dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj create mode 100644 dev/integration_tests/flavors/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme create mode 100644 dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme create mode 100644 dev/integration_tests/flavors/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 dev/integration_tests/flavors/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 dev/integration_tests/flavors/macos/Runner/AppDelegate.swift create mode 100644 dev/integration_tests/flavors/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 dev/integration_tests/flavors/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Runner/Configs/Generated.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Runner/Configs/Warnings.xcconfig create mode 100644 dev/integration_tests/flavors/macos/Runner/DebugProfile.entitlements create mode 100644 dev/integration_tests/flavors/macos/Runner/Info.plist create mode 100644 dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift create mode 100644 dev/integration_tests/flavors/macos/Runner/Release.entitlements diff --git a/dev/integration_tests/flavors/macos/.gitignore b/dev/integration_tests/flavors/macos/.gitignore new file mode 100644 index 0000000000000..746adbb6b9e14 --- /dev/null +++ b/dev/integration_tests/flavors/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig b/dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000000000..4b81f9b2d200f --- /dev/null +++ b/dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig b/dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000000000..5caa9d1579e48 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/integration_tests/flavors/macos/Free App copy-Info.plist b/dev/integration_tests/flavors/macos/Free App copy-Info.plist new file mode 100644 index 0000000000000..e6e728b552176 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Free App copy-Info.plist @@ -0,0 +1,34 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + Flavor + ${PRODUCT_FLAVOR} + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements b/dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements new file mode 100644 index 0000000000000..dddb8a30c851e --- /dev/null +++ b/dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/dev/integration_tests/flavors/macos/Podfile b/dev/integration_tests/flavors/macos/Podfile new file mode 100644 index 0000000000000..490f9aa98d905 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Podfile @@ -0,0 +1,42 @@ +# platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug Free' => :debug, + 'Debug Paid' => :release, + 'Release Free' => :release, + 'Release Paid' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Free App' do + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) +end + +target 'Paid App' do + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000000000..b13f2ef0c8d11 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,947 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 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 */; }; + 663C883A401E8B99D7337FCC /* libPods-Paid App.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58A725CFB8BC934A3F046150 /* libPods-Paid App.a */; }; + 8BF0074AD40D75B931844BE7 /* libPods-Free App.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9987E4174B38E41820C3697 /* libPods-Free App.a */; }; + F383D4A92938029D00598432 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + F383D4AA2938029D00598432 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + F383D4AB2938029D00598432 /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + F383D4AE2938029D00598432 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + F383D4AF2938029D00598432 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; + F383D4A72938029D00598432 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; + F383D4B02938029D00598432 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 00345DA6FCD99B9C4EB2FB8F /* Pods-Free App.release free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.release free.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.release free.xcconfig"; sourceTree = ""; }; + 03BFD7CB613D693E93EA10D3 /* Pods-Paid App.release paid.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Paid App.release paid.xcconfig"; path = "Target Support Files/Pods-Paid App/Pods-Paid App.release paid.xcconfig"; sourceTree = ""; }; + 1E098523B696CAC92707B76B /* Pods-Paid App.debug paid.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Paid App.debug paid.xcconfig"; path = "Target Support Files/Pods-Paid App/Pods-Paid App.debug paid.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 /* Free App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Free App.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 = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 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 = ""; }; + 35225E323D930A73FA5E1D08 /* Pods-Paid App.debug free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Paid App.debug free.xcconfig"; path = "Target Support Files/Pods-Paid App/Pods-Paid App.debug free.xcconfig"; sourceTree = ""; }; + 4EE9E9CEB7B16E4A38D4DD10 /* Pods-Paid App.release free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Paid App.release free.xcconfig"; path = "Target Support Files/Pods-Paid App/Pods-Paid App.release free.xcconfig"; sourceTree = ""; }; + 58A725CFB8BC934A3F046150 /* libPods-Paid App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Paid App.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5C512C6F02E8441E2A176389 /* Pods-Free App.debug paid.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.debug paid.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.debug paid.xcconfig"; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 8A142B2C656E53DEAA8BA7B7 /* Pods-Free App.release paid.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.release paid.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.release paid.xcconfig"; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + A9987E4174B38E41820C3697 /* libPods-Free App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Free App.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + CADFDE69E11F94E130E2A47A /* Pods-Free App.debug free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.debug free.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig"; sourceTree = ""; }; + F383D4B62938029D00598432 /* Paid App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Paid App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + F383D4B72938029E00598432 /* Free App copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Free App copy-Info.plist"; path = "/Users/stephenwallen/Development/flutter/flutter/dev/integration_tests/flavors/macos/Free App copy-Info.plist"; sourceTree = ""; }; + F3ADFB692951303300135EA2 /* Paid AppDebug Free.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Paid AppDebug Free.entitlements"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BF0074AD40D75B931844BE7 /* libPods-Free App.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F383D4AC2938029D00598432 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 663C883A401E8B99D7337FCC /* libPods-Paid App.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + F3ADFB692951303300135EA2 /* Paid AppDebug Free.entitlements */, + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + F383D4B72938029E00598432 /* Free App copy-Info.plist */, + A04A00ABC8C742B7FEF93A1D /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* Free App.app */, + F383D4B62938029D00598432 /* Paid App.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + A04A00ABC8C742B7FEF93A1D /* Pods */ = { + isa = PBXGroup; + children = ( + CADFDE69E11F94E130E2A47A /* Pods-Free App.debug free.xcconfig */, + 5C512C6F02E8441E2A176389 /* Pods-Free App.debug paid.xcconfig */, + 00345DA6FCD99B9C4EB2FB8F /* Pods-Free App.release free.xcconfig */, + 8A142B2C656E53DEAA8BA7B7 /* Pods-Free App.release paid.xcconfig */, + 35225E323D930A73FA5E1D08 /* Pods-Paid App.debug free.xcconfig */, + 1E098523B696CAC92707B76B /* Pods-Paid App.debug paid.xcconfig */, + 4EE9E9CEB7B16E4A38D4DD10 /* Pods-Paid App.release free.xcconfig */, + 03BFD7CB613D693E93EA10D3 /* Pods-Paid App.release paid.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + A9987E4174B38E41820C3697 /* libPods-Free App.a */, + 58A725CFB8BC934A3F046150 /* libPods-Paid App.a */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Free App */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Free App" */; + buildPhases = ( + 78BB8154DBE51F88B2951D13 /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = "Free App"; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* Free App.app */; + productType = "com.apple.product-type.application"; + }; + F383D4A52938029D00598432 /* Paid App */ = { + isa = PBXNativeTarget; + buildConfigurationList = F383D4B22938029D00598432 /* Build configuration list for PBXNativeTarget "Paid App" */; + buildPhases = ( + 498A7EBF6E81A989463D4105 /* [CP] Check Pods Manifest.lock */, + F383D4A82938029D00598432 /* Sources */, + F383D4AC2938029D00598432 /* Frameworks */, + F383D4AD2938029D00598432 /* Resources */, + F383D4B02938029D00598432 /* Bundle Framework */, + F383D4B12938029D00598432 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + F383D4A62938029D00598432 /* PBXTargetDependency */, + ); + name = "Paid App"; + productName = Runner; + productReference = F383D4B62938029D00598432 /* Paid App.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Free App */, + F383D4A52938029D00598432 /* Paid App */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F383D4AD2938029D00598432 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F383D4AE2938029D00598432 /* Assets.xcassets in Resources */, + F383D4AF2938029D00598432 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + 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"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire\n"; + }; + 498A7EBF6E81A989463D4105 /* [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-Paid App-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; + }; + 78BB8154DBE51F88B2951D13 /* [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-Free App-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; + }; + F383D4B12938029D00598432 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + 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"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F383D4A82938029D00598432 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F383D4A92938029D00598432 /* MainFlutterWindow.swift in Sources */, + F383D4AA2938029D00598432 /* AppDelegate.swift in Sources */, + F383D4AB2938029D00598432 /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; + F383D4A62938029D00598432 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = F383D4A72938029D00598432 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 33CC10F92044A3C60003C045 /* Debug Free */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_FLAVOR = free; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = "Debug Free"; + }; + 33CC10FA2044A3C60003C045 /* Release Free */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_FLAVOR = free; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = "Release Free"; + }; + 33CC10FC2044A3C60003C045 /* Debug Free */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; + PRODUCT_FLAVOR = free; + PRODUCT_NAME = "Free App"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = "Debug Free"; + }; + 33CC10FD2044A3C60003C045 /* Release Free */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; + PRODUCT_FLAVOR = free; + PRODUCT_NAME = "Free App"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = "Release Free"; + }; + 33CC111C2044C6BA0003C045 /* Debug Free */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Debug Free"; + }; + 33CC111D2044C6BA0003C045 /* Release Free */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Release Free"; + }; + F383D4B32938029D00598432 /* Debug Free */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = "Paid AppDebug Free.entitlements"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "Free App copy-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; + PRODUCT_FLAVOR = free; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = "Debug Free"; + }; + F383D4B42938029D00598432 /* Release Free */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "Free App copy-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; + PRODUCT_FLAVOR = free; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = "Release Free"; + }; + F383D4B8293802D100598432 /* Debug Paid */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_FLAVOR = paid; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = "Debug Paid"; + }; + F383D4B9293802D100598432 /* Debug Paid */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; + PRODUCT_FLAVOR = paid; + PRODUCT_NAME = "Free App"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = "Debug Paid"; + }; + F383D4BA293802D100598432 /* Debug Paid */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "Free App copy-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; + PRODUCT_FLAVOR = paid; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = "Debug Paid"; + }; + F383D4BB293802D100598432 /* Debug Paid */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Debug Paid"; + }; + F383D4BC293802E000598432 /* Release Paid */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_FLAVOR = paid; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = "Release Paid"; + }; + F383D4BD293802E000598432 /* Release Paid */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; + PRODUCT_FLAVOR = paid; + PRODUCT_NAME = "Free App"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = "Release Paid"; + }; + F383D4BE293802E000598432 /* Release Paid */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "Free App copy-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; + PRODUCT_FLAVOR = paid; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = "Release Paid"; + }; + F383D4BF293802E000598432 /* Release Paid */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Release Paid"; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug Free */, + F383D4B8293802D100598432 /* Debug Paid */, + 33CC10FA2044A3C60003C045 /* Release Free */, + F383D4BC293802E000598432 /* Release Paid */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = "Release Free"; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Free App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug Free */, + F383D4B9293802D100598432 /* Debug Paid */, + 33CC10FD2044A3C60003C045 /* Release Free */, + F383D4BD293802E000598432 /* Release Paid */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = "Release Free"; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug Free */, + F383D4BB293802D100598432 /* Debug Paid */, + 33CC111D2044C6BA0003C045 /* Release Free */, + F383D4BF293802E000598432 /* Release Paid */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = "Release Free"; + }; + F383D4B22938029D00598432 /* Build configuration list for PBXNativeTarget "Paid App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F383D4B32938029D00598432 /* Debug Free */, + F383D4BA293802D100598432 /* Debug Paid */, + F383D4B42938029D00598432 /* Release Free */, + F383D4BE293802E000598432 /* Release Paid */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = "Release Free"; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000000..18d981003d68d --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme new file mode 100644 index 0000000000000..12dd1c1f3e516 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme new file mode 100644 index 0000000000000..48c02d62e9f4a --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/integration_tests/flavors/macos/Runner.xcworkspace/contents.xcworkspacedata b/dev/integration_tests/flavors/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000000..21a3cc14c74e9 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/dev/integration_tests/flavors/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dev/integration_tests/flavors/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000000..18d981003d68d --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/dev/integration_tests/flavors/macos/Runner/AppDelegate.swift b/dev/integration_tests/flavors/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000000000..d080d41951d35 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/dev/integration_tests/flavors/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/dev/integration_tests/flavors/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000000..a2ec33f19f110 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/dev/integration_tests/flavors/macos/Runner/Base.lproj/MainMenu.xib b/dev/integration_tests/flavors/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000000000..80e867a4e06b4 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000000000..c8e4703c2e52a --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = flavors + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2022 com.yourcompany. All rights reserved. diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000000000..806efaca23961 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,4 @@ +// This xcconfig used for both the paid and free flavor, but the plugins are not different between +// them. Pick one. +#include? "Pods/Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig" +#include "Generated.xcconfig" diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Generated.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Generated.xcconfig new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000000000..45e4d9789b766 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,4 @@ +// This xcconfig used for both the paid and free flavor, but the plugins are not different between +// them. Pick one. +#include? "Pods/Target Support Files/Pods-Paid App/Pods-Paid App.release free.xcconfig" +#include "Generated.xcconfig" diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Warnings.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000000000..42bcbf4780b18 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/dev/integration_tests/flavors/macos/Runner/DebugProfile.entitlements b/dev/integration_tests/flavors/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000000000..dddb8a30c851e --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/dev/integration_tests/flavors/macos/Runner/Info.plist b/dev/integration_tests/flavors/macos/Runner/Info.plist new file mode 100644 index 0000000000000..e6e728b552176 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Info.plist @@ -0,0 +1,34 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + Flavor + ${PRODUCT_FLAVOR} + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift b/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000000000..c8c554f4ac342 --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,31 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + RegisterMethodChannel(registry: flutterViewController) + + super.awakeFromNib() + } + + + func RegisterMethodChannel(registry: FlutterPluginRegistry) { + let registrar = registry.registrar(forPlugin: "flavors") + let channel = FlutterMethodChannel(name: "flavor", + binaryMessenger: registrar.messenger) + channel.setMethodCallHandler({ (call, result) in + let flavor = Bundle.main.infoDictionary?["Flavor"] as? String + result(flavor) + }) + } +} diff --git a/dev/integration_tests/flavors/macos/Runner/Release.entitlements b/dev/integration_tests/flavors/macos/Runner/Release.entitlements new file mode 100644 index 0000000000000..852fa1a4728ae --- /dev/null +++ b/dev/integration_tests/flavors/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + From d10d7a17a253147fe7951904fed415d24d5920bc Mon Sep 17 00:00:00 2001 From: Alex Wallen Date: Mon, 19 Dec 2022 16:42:17 -0800 Subject: [PATCH 02/15] Update `buildConfiguration` Co-authored-by: Jenn Magder --- .../macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme index 48c02d62e9f4a..2e0e64bf2a1ed 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/paid.xcscheme @@ -69,7 +69,7 @@ + buildConfiguration = "Debug Paid"> Date: Mon, 19 Dec 2022 16:42:31 -0800 Subject: [PATCH 03/15] Update project mappings Co-authored-by: Jenn Magder --- dev/integration_tests/flavors/macos/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/integration_tests/flavors/macos/Podfile b/dev/integration_tests/flavors/macos/Podfile index 490f9aa98d905..0465c20f362fe 100644 --- a/dev/integration_tests/flavors/macos/Podfile +++ b/dev/integration_tests/flavors/macos/Podfile @@ -5,7 +5,7 @@ ENV['COCOAPODS_DISABLE_STATS'] = 'true' project 'Runner', { 'Debug Free' => :debug, - 'Debug Paid' => :release, + 'Debug Paid' => :debug, 'Release Free' => :release, 'Release Paid' => :release, } From 322eb08369eb9d1d8591a8a2ad7362452565e6b4 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Mon, 19 Dec 2022 16:53:10 -0800 Subject: [PATCH 04/15] Make CODE_SIGN_STYLE automatic --- .../flavors/macos/Runner.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index b13f2ef0c8d11..783da613a41f6 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -631,7 +631,7 @@ 33CC111C2044C6BA0003C045 /* Debug Free */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Debug Free"; @@ -791,7 +791,7 @@ F383D4BB293802D100598432 /* Debug Paid */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Debug Paid"; From 87fdf912d34f5ed9f8c6dba3921e4ab767c04dfb Mon Sep 17 00:00:00 2001 From: a-wallen Date: Mon, 19 Dec 2022 16:57:45 -0800 Subject: [PATCH 05/15] Rename Free App copy-Info.plist to Free App Info.plist --- ...{Free App copy-Info.plist => Free App Info.plist} | 0 .../flavors/macos/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename dev/integration_tests/flavors/macos/{Free App copy-Info.plist => Free App Info.plist} (100%) diff --git a/dev/integration_tests/flavors/macos/Free App copy-Info.plist b/dev/integration_tests/flavors/macos/Free App Info.plist similarity index 100% rename from dev/integration_tests/flavors/macos/Free App copy-Info.plist rename to dev/integration_tests/flavors/macos/Free App Info.plist diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index 783da613a41f6..042fbadc5d9f2 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -103,7 +103,7 @@ A9987E4174B38E41820C3697 /* libPods-Free App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Free App.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CADFDE69E11F94E130E2A47A /* Pods-Free App.debug free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.debug free.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig"; sourceTree = ""; }; F383D4B62938029D00598432 /* Paid App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Paid App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - F383D4B72938029E00598432 /* Free App copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Free App copy-Info.plist"; path = "/Users/stephenwallen/Development/flutter/flutter/dev/integration_tests/flavors/macos/Free App copy-Info.plist"; sourceTree = ""; }; + F383D4B72938029E00598432 /* Free App Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Free App Info.plist"; path = "/Users/stephenwallen/Development/flutter/flutter/dev/integration_tests/flavors/macos/Free App Info.plist"; sourceTree = ""; }; F3ADFB692951303300135EA2 /* Paid AppDebug Free.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Paid AppDebug Free.entitlements"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -146,7 +146,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - F383D4B72938029E00598432 /* Free App copy-Info.plist */, + F383D4B72938029E00598432 /* Free App Info.plist */, A04A00ABC8C742B7FEF93A1D /* Pods */, ); sourceTree = ""; @@ -653,7 +653,7 @@ CODE_SIGN_ENTITLEMENTS = "Paid AppDebug Free.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App copy-Info.plist"; + INFOPLIST_FILE = "Free App Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -676,7 +676,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App copy-Info.plist"; + INFOPLIST_FILE = "Free App Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -774,7 +774,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App copy-Info.plist"; + INFOPLIST_FILE = "Free App Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -873,7 +873,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App copy-Info.plist"; + INFOPLIST_FILE = "Free App Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", From 27dd97e92a3c78d32d1dfc12e15c9bc21c9c7247 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Mon, 19 Dec 2022 17:13:50 -0800 Subject: [PATCH 06/15] Make App Info plist relative to group --- .../flavors/macos/Runner.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index 042fbadc5d9f2..9b476ebfed8d7 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -103,7 +103,7 @@ A9987E4174B38E41820C3697 /* libPods-Free App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Free App.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CADFDE69E11F94E130E2A47A /* Pods-Free App.debug free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.debug free.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig"; sourceTree = ""; }; F383D4B62938029D00598432 /* Paid App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Paid App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - F383D4B72938029E00598432 /* Free App Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Free App Info.plist"; path = "/Users/stephenwallen/Development/flutter/flutter/dev/integration_tests/flavors/macos/Free App Info.plist"; sourceTree = ""; }; + F383D4B72938029E00598432 /* Free App Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Free App Info.plist"; sourceTree = ""; }; F3ADFB692951303300135EA2 /* Paid AppDebug Free.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Paid AppDebug Free.entitlements"; sourceTree = ""; }; /* End PBXFileReference section */ From 3052a19af1d0bba6718013f08e200559dfa0a487 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Mon, 19 Dec 2022 17:22:23 -0800 Subject: [PATCH 07/15] Remove bogus entitlements --- .../flavors/macos/Paid AppDebug Free.entitlements | 12 ------------ .../flavors/macos/Runner.xcodeproj/project.pbxproj | 4 +--- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements diff --git a/dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements b/dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements deleted file mode 100644 index dddb8a30c851e..0000000000000 --- a/dev/integration_tests/flavors/macos/Paid AppDebug Free.entitlements +++ /dev/null @@ -1,12 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.cs.allow-jit - - com.apple.security.network.server - - - diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index 9b476ebfed8d7..a8d9c95027255 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -104,7 +104,6 @@ CADFDE69E11F94E130E2A47A /* Pods-Free App.debug free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.debug free.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig"; sourceTree = ""; }; F383D4B62938029D00598432 /* Paid App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Paid App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; F383D4B72938029E00598432 /* Free App Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Free App Info.plist"; sourceTree = ""; }; - F3ADFB692951303300135EA2 /* Paid AppDebug Free.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Paid AppDebug Free.entitlements"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -141,7 +140,6 @@ 33CC10E42044A3C60003C045 = { isa = PBXGroup; children = ( - F3ADFB692951303300135EA2 /* Paid AppDebug Free.entitlements */, 33FAB671232836740065AC1E /* Runner */, 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, @@ -650,7 +648,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "Paid AppDebug Free.entitlements"; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "Free App Info.plist"; From afbffced301980fd4ea3a9d3ee950ee1711a5b9f Mon Sep 17 00:00:00 2001 From: a-wallen Date: Tue, 20 Dec 2022 11:04:09 -0800 Subject: [PATCH 08/15] Remove Generated.xcconfig --- .../flavors/macos/Runner/Configs/Debug.xcconfig | 1 - .../flavors/macos/Runner/Configs/Generated.xcconfig | 0 .../flavors/macos/Runner/Configs/Release.xcconfig | 1 - 3 files changed, 2 deletions(-) delete mode 100644 dev/integration_tests/flavors/macos/Runner/Configs/Generated.xcconfig diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig index 806efaca23961..ea3828be6c3ac 100644 --- a/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig +++ b/dev/integration_tests/flavors/macos/Runner/Configs/Debug.xcconfig @@ -1,4 +1,3 @@ // This xcconfig used for both the paid and free flavor, but the plugins are not different between // them. Pick one. #include? "Pods/Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig" -#include "Generated.xcconfig" diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Generated.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Generated.xcconfig deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig index 45e4d9789b766..4428ea7a33b23 100644 --- a/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig +++ b/dev/integration_tests/flavors/macos/Runner/Configs/Release.xcconfig @@ -1,4 +1,3 @@ // This xcconfig used for both the paid and free flavor, but the plugins are not different between // them. Pick one. #include? "Pods/Target Support Files/Pods-Paid App/Pods-Paid App.release free.xcconfig" -#include "Generated.xcconfig" From 06388a1d5548c713e5174c3270869cdbab6fbf20 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Wed, 21 Dec 2022 17:58:49 -0800 Subject: [PATCH 09/15] Audit project.pbxproj --- .../macos/Runner.xcodeproj/project.pbxproj | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index a8d9c95027255..98b21abbda3e6 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -103,7 +103,6 @@ A9987E4174B38E41820C3697 /* libPods-Free App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Free App.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CADFDE69E11F94E130E2A47A /* Pods-Free App.debug free.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Free App.debug free.xcconfig"; path = "Target Support Files/Pods-Free App/Pods-Free App.debug free.xcconfig"; sourceTree = ""; }; F383D4B62938029D00598432 /* Paid App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Paid App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - F383D4B72938029E00598432 /* Free App Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Free App Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -144,7 +143,6 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - F383D4B72938029E00598432 /* Free App Info.plist */, A04A00ABC8C742B7FEF93A1D /* Pods */, ); sourceTree = ""; @@ -629,7 +627,7 @@ 33CC111C2044C6BA0003C045 /* Debug Free */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Debug Free"; @@ -651,13 +649,12 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App Info.plist"; + INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; - PRODUCT_FLAVOR = free; + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -674,13 +671,12 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App Info.plist"; + INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; - PRODUCT_FLAVOR = free; + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -754,9 +750,9 @@ "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; PRODUCT_FLAVOR = paid; - PRODUCT_NAME = "Free App"; + PRODUCT_NAME = "Paid App"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -772,13 +768,12 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App Info.plist"; + INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; - PRODUCT_FLAVOR = paid; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -789,7 +784,7 @@ F383D4BB293802D100598432 /* Debug Paid */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Debug Paid"; @@ -854,9 +849,9 @@ "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.free; + PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; PRODUCT_FLAVOR = paid; - PRODUCT_NAME = "Free App"; + PRODUCT_NAME = "Paid App"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -871,13 +866,12 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "Free App Info.plist"; + INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors.paid; - PRODUCT_FLAVOR = paid; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; From 01b344341e3e6ff788d293f58db7d07eb9668f65 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Wed, 21 Dec 2022 17:58:49 -0800 Subject: [PATCH 10/15] Remove unused configs --- .../flavors/macos/Flutter/Flutter-Debug.xcconfig | 2 -- .../flavors/macos/Flutter/Flutter-Release.xcconfig | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig delete mode 100644 dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig diff --git a/dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig b/dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig deleted file mode 100644 index 4b81f9b2d200f..0000000000000 --- a/dev/integration_tests/flavors/macos/Flutter/Flutter-Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig b/dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig deleted file mode 100644 index 5caa9d1579e48..0000000000000 --- a/dev/integration_tests/flavors/macos/Flutter/Flutter-Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" -#include "ephemeral/Flutter-Generated.xcconfig" From 4e5f2594a7ca45316dae7f62f1e6353a677b628d Mon Sep 17 00:00:00 2001 From: a-wallen Date: Wed, 21 Dec 2022 17:58:49 -0800 Subject: [PATCH 11/15] share one info.plist --- .../flavors/macos/Free App Info.plist | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 dev/integration_tests/flavors/macos/Free App Info.plist diff --git a/dev/integration_tests/flavors/macos/Free App Info.plist b/dev/integration_tests/flavors/macos/Free App Info.plist deleted file mode 100644 index e6e728b552176..0000000000000 --- a/dev/integration_tests/flavors/macos/Free App Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - Flavor - ${PRODUCT_FLAVOR} - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - $(PRODUCT_COPYRIGHT) - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - From e6b586a7ec9531968162a91a90fd932e1bce8ff7 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Wed, 21 Dec 2022 17:58:49 -0800 Subject: [PATCH 12/15] Modify scheme so that paid app works --- .../macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme index 12dd1c1f3e516..2c7ff869d074e 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme @@ -61,7 +61,7 @@ Date: Wed, 21 Dec 2022 17:58:49 -0800 Subject: [PATCH 13/15] Codesign automatic --- .../flavors/macos/Runner.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index 98b21abbda3e6..be90249f396d9 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -627,7 +627,7 @@ 33CC111C2044C6BA0003C045 /* Debug Free */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Debug Free"; @@ -784,7 +784,7 @@ F383D4BB293802D100598432 /* Debug Paid */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Debug Paid"; From e4044cad95150bcf2dc8660d19866da076497eca Mon Sep 17 00:00:00 2001 From: Alex Wallen Date: Tue, 10 Jan 2023 07:18:35 -1000 Subject: [PATCH 14/15] Update copyright Co-authored-by: Jenn Magder --- .../flavors/macos/Runner/Configs/AppInfo.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig b/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig index c8e4703c2e52a..cccb47204ec04 100644 --- a/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig +++ b/dev/integration_tests/flavors/macos/Runner/Configs/AppInfo.xcconfig @@ -11,4 +11,4 @@ PRODUCT_NAME = flavors PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flavors // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2022 com.yourcompany. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2014 The Flutter Authors. All rights reserved. From f14844660772010f5291d15adc19badee1d935e1 Mon Sep 17 00:00:00 2001 From: a-wallen Date: Thu, 12 Jan 2023 10:43:29 -0800 Subject: [PATCH 15/15] Remove unused .xcconfig refs --- .../flavors/macos/Runner.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj index be90249f396d9..af934cb2aa8d9 100644 --- a/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj @@ -87,8 +87,6 @@ 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; - 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; - 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; 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 = ""; }; @@ -171,8 +169,6 @@ isa = PBXGroup; children = ( 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, - 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, - 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, ); path = Flutter;