diff --git a/examples/multiple_flavors/distribute_options.yaml b/examples/multiple_flavors/distribute_options.yaml index 865fbbb3..49e85df4 100644 --- a/examples/multiple_flavors/distribute_options.yaml +++ b/examples/multiple_flavors/distribute_options.yaml @@ -85,3 +85,37 @@ releases: flavor: prod dart-define: APP_ENV: prod + - name: dmg-profile + jobs: + - name: dev + package: + platform: macos + target: dmg + channel: dev + build_args: + profile: true + flavor: dev + - name: prod + package: + platform: macos + target: dmg + channel: prod + build_args: + profile: true + flavor: prod + - name: dmg-release + jobs: + - name: dev + package: + platform: macos + target: dmg + channel: dev + build_args: + flavor: dev + - name: prod + package: + platform: macos + target: dmg + channel: prod + build_args: + flavor: prod diff --git a/examples/multiple_flavors/ios/Flutter/AppFrameworkInfo.plist b/examples/multiple_flavors/ios/Flutter/AppFrameworkInfo.plist index 9625e105..7c569640 100644 --- a/examples/multiple_flavors/ios/Flutter/AppFrameworkInfo.plist +++ b/examples/multiple_flavors/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/examples/multiple_flavors/ios/Podfile b/examples/multiple_flavors/ios/Podfile index 07131ae4..5517a6dd 100644 --- a/examples/multiple_flavors/ios/Podfile +++ b/examples/multiple_flavors/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/examples/multiple_flavors/ios/Podfile.lock b/examples/multiple_flavors/ios/Podfile.lock index e4d26acb..eea103b4 100644 --- a/examples/multiple_flavors/ios/Podfile.lock +++ b/examples/multiple_flavors/ios/Podfile.lock @@ -14,9 +14,9 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/package_info_plus/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 -PODFILE CHECKSUM: ab3a067f90124ffbe19de8e806009e92f258e11e +PODFILE CHECKSUM: cd1a3f968399f08b80822437f090438a40dce62d -COCOAPODS: 1.11.3 +COCOAPODS: 1.14.3 diff --git a/examples/multiple_flavors/ios/Runner.xcodeproj/project.pbxproj b/examples/multiple_flavors/ios/Runner.xcodeproj/project.pbxproj index 1f679786..05c1fe12 100644 --- a/examples/multiple_flavors/ios/Runner.xcodeproj/project.pbxproj +++ b/examples/multiple_flavors/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -169,7 +169,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -212,10 +212,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -248,6 +250,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -336,7 +339,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -411,7 +414,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -460,7 +463,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -548,7 +551,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -617,7 +620,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/examples/multiple_flavors/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/examples/multiple_flavors/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a3..5e31d3d3 100644 --- a/examples/multiple_flavors/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/examples/multiple_flavors/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/examples/multiple_flavors/macos/Runner.xcodeproj/project.pbxproj b/examples/multiple_flavors/macos/Runner.xcodeproj/project.pbxproj index c72a0b57..0c92294d 100644 --- a/examples/multiple_flavors/macos/Runner.xcodeproj/project.pbxproj +++ b/examples/multiple_flavors/macos/Runner.xcodeproj/project.pbxproj @@ -62,7 +62,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 18CE1DE3B79E8BA6C8C5F5B4 /* Pods-Runner.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-prod.xcconfig"; sourceTree = ""; }; 1C2D8297C5B081A26E4A5EF7 /* Pods-Runner.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-dev.xcconfig"; sourceTree = ""; }; + 21F0E5EDEEFBAE48AC66E470 /* Pods-RunnerTests.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-prod.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-prod.xcconfig"; sourceTree = ""; }; 2A747F6A39C21082F9411486 /* 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 = ""; }; 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 = ""; }; @@ -80,7 +82,9 @@ 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 = ""; }; + 550DAD9A3B9C07FBAC407740 /* Pods-Runner.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-dev.xcconfig"; sourceTree = ""; }; 701F0FAB6E430954A43A0CF7 /* 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 = ""; }; + 72779351C7D178E838823752 /* Pods-RunnerTests.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-dev.xcconfig"; sourceTree = ""; }; 771AFDF2BAA0ACD25543902A /* 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; @@ -202,6 +206,10 @@ B58363B85E9ED6606E885147 /* Pods-RunnerTests.release-prod.xcconfig */, 1C2D8297C5B081A26E4A5EF7 /* Pods-Runner.release-dev.xcconfig */, CC3CA63941F965225A33A488 /* Pods-RunnerTests.release-dev.xcconfig */, + 550DAD9A3B9C07FBAC407740 /* Pods-Runner.profile-dev.xcconfig */, + 18CE1DE3B79E8BA6C8C5F5B4 /* Pods-Runner.profile-prod.xcconfig */, + 72779351C7D178E838823752 /* Pods-RunnerTests.profile-dev.xcconfig */, + 21F0E5EDEEFBAE48AC66E470 /* Pods-RunnerTests.profile-prod.xcconfig */, ); path = Pods; sourceTree = ""; @@ -941,6 +949,188 @@ }; name = "Release-dev"; }; + F5C5D00F2C1DC7CF0057B2C4 /* Profile-prod */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + 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; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = "Profile-prod"; + }; + F5C5D0102C1DC7CF0057B2C4 /* Profile-prod */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.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", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = "Profile-prod"; + }; + F5C5D0112C1DC7CF0057B2C4 /* Profile-prod */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 21F0E5EDEEFBAE48AC66E470 /* Pods-RunnerTests.profile-prod.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.leanflutter.examples.multipleFlavors.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/multiple_flavors.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/multiple_flavors"; + }; + name = "Profile-prod"; + }; + F5C5D0122C1DC7CF0057B2C4 /* Profile-prod */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Profile-prod"; + }; + F5C5D0132C1DC7DA0057B2C4 /* Profile-dev */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + 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; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = "Profile-dev"; + }; + F5C5D0142C1DC7DA0057B2C4 /* Profile-dev */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.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", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = "Profile-dev"; + }; + F5C5D0152C1DC7DA0057B2C4 /* Profile-dev */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 72779351C7D178E838823752 /* Pods-RunnerTests.profile-dev.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.leanflutter.examples.multipleFlavors.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/multiple_flavors.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/multiple_flavors"; + }; + name = "Profile-dev"; + }; + F5C5D0162C1DC7DA0057B2C4 /* Profile-dev */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Profile-dev"; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -952,6 +1142,8 @@ F5C5D0092C1DC64F0057B2C4 /* Release-dev */, F5C5D0052C1DC6380057B2C4 /* Release-prod */, 331C80DD294CF71000263BE5 /* Profile */, + F5C5D0152C1DC7DA0057B2C4 /* Profile-dev */, + F5C5D0112C1DC7CF0057B2C4 /* Profile-prod */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -964,6 +1156,8 @@ F5C5D0072C1DC64F0057B2C4 /* Release-dev */, F5C5D0032C1DC6380057B2C4 /* Release-prod */, 338D0CE9231458BD00FA5F75 /* Profile */, + F5C5D0132C1DC7DA0057B2C4 /* Profile-dev */, + F5C5D00F2C1DC7CF0057B2C4 /* Profile-prod */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -976,6 +1170,8 @@ F5C5D0082C1DC64F0057B2C4 /* Release-dev */, F5C5D0042C1DC6380057B2C4 /* Release-prod */, 338D0CEA231458BD00FA5F75 /* Profile */, + F5C5D0142C1DC7DA0057B2C4 /* Profile-dev */, + F5C5D0102C1DC7CF0057B2C4 /* Profile-prod */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -988,6 +1184,8 @@ F5C5D00A2C1DC64F0057B2C4 /* Release-dev */, F5C5D0062C1DC6380057B2C4 /* Release-prod */, 338D0CEB231458BD00FA5F75 /* Profile */, + F5C5D0162C1DC7DA0057B2C4 /* Profile-dev */, + F5C5D0122C1DC7CF0057B2C4 /* Profile-prod */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/examples/multiple_flavors/macos/packaging/dmg/make_config.yaml b/examples/multiple_flavors/macos/packaging/dmg/make_config.yaml new file mode 100644 index 00000000..d1f63998 --- /dev/null +++ b/examples/multiple_flavors/macos/packaging/dmg/make_config.yaml @@ -0,0 +1,10 @@ +title: multiple_flavors +contents: + - x: 448 + y: 344 + type: link + path: "/Applications" + - x: 192 + y: 344 + type: file + path: multiple_flavors.app diff --git a/packages/flutter_app_builder/CHANGELOG.md b/packages/flutter_app_builder/CHANGELOG.md index aa9aa2c9..8e67ac5c 100644 --- a/packages/flutter_app_builder/CHANGELOG.md +++ b/packages/flutter_app_builder/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.4 + +* feat: macOS builder support flavor arg. #133 + ## 0.4.2 * some fixes diff --git a/packages/flutter_app_builder/lib/src/builders/macos/build_macos_result.dart b/packages/flutter_app_builder/lib/src/builders/macos/build_macos_result.dart index 873d8795..a16cccbd 100644 --- a/packages/flutter_app_builder/lib/src/builders/macos/build_macos_result.dart +++ b/packages/flutter_app_builder/lib/src/builders/macos/build_macos_result.dart @@ -23,6 +23,9 @@ class BuildMacOsResult extends BuildResult { Directory get outputDirectory { String buildMode = ReCase(config.mode.name).sentenceCase; String path = 'build/macos/Build/Products/$buildMode'; + if (config.flavor != null) { + path = '$path-${config.flavor}'; + } return Directory(path); } } diff --git a/packages/flutter_app_builder/pubspec.yaml b/packages/flutter_app_builder/pubspec.yaml index aad8b1e5..b35854e1 100644 --- a/packages/flutter_app_builder/pubspec.yaml +++ b/packages/flutter_app_builder/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_app_builder description: Build your Flutter app via Dart. -version: 0.4.2 +version: 0.4.4 homepage: https://distributor.leanflutter.dev repository: https://github.com/leanflutter/flutter_distributor/tree/main/packages/flutter_app_builder diff --git a/packages/flutter_distributor/CHANGELOG.md b/packages/flutter_distributor/CHANGELOG.md index 0efe786c..2fbb5c8f 100644 --- a/packages/flutter_distributor/CHANGELOG.md +++ b/packages/flutter_distributor/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.4 + +* feat: macOS builder support flavor arg. #133 + ## 0.4.3 * Fix the issue of garbled text in parseAppPackage on macOS. diff --git a/packages/flutter_distributor/pubspec.yaml b/packages/flutter_distributor/pubspec.yaml index 242c29c8..30c55b3c 100644 --- a/packages/flutter_distributor/pubspec.yaml +++ b/packages/flutter_distributor/pubspec.yaml @@ -18,12 +18,9 @@ dependencies: args: ^2.2.0 charset: ^2.0.1 dio: ^5.3.4 - flutter_app_builder: - path: ../flutter_app_builder - flutter_app_packager: - path: ../flutter_app_packager - flutter_app_publisher: - path: ../flutter_app_publisher + flutter_app_builder: ^0.4.4 + flutter_app_packager: ^0.4.2 + flutter_app_publisher: ^0.4.2 logging: ^1.0.2 path: ^1.8.1 pubspec_parse: ^1.1.0