From 2c16c5b0b384d52c660fbdea11922aceeb01ff74 Mon Sep 17 00:00:00 2001 From: Jeff Gardner <202880+erskingardner@users.noreply.github.com> Date: Fri, 22 May 2026 09:16:03 +0200 Subject: [PATCH] chore: prepare v2026.5.22+25 release --- CHANGELOG.md | 14 +++++++++++++ fastlane/Fastfile | 23 ++++++++++++++++----- ios/ExportOptions.production-ad-hoc.plist | 25 +++++++++++++++++++++++ ios/Podfile.lock | 7 ------- ios/Runner.xcodeproj/project.pbxproj | 22 ++++++++++++++++++-- pubspec.yaml | 2 +- widgetbook/pubspec.lock | 2 +- 7 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 ios/ExportOptions.production-ad-hoc.plist diff --git a/CHANGELOG.md b/CHANGELOG.md index 08da183..e970adb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,20 @@ and this project adheres to Calendar Versioning (CalVer). ## Unreleased +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [2026.5.22] - 2026-05-22 + ### Added - Leave group from chat list for non-last admins [PR #638](https://github.com/marmot-protocol/whitenoise/pull/638) - Add archive option in chat removed warning and change wording for leave case [PR #657](https://github.com/marmot-protocol/whitenoise/pull/657) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index dd0b839..5f2da61 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -20,7 +20,16 @@ FLAVORS = { }.freeze def run_from_root(parts) - sh("cd #{Shellwords.escape(ROOT)} && #{parts.shelljoin}") + env_parts = [ + 'env', + '-u', 'BUNDLE_BIN_PATH', + '-u', 'BUNDLE_GEMFILE', + '-u', 'BUNDLE_PATH', + '-u', 'BUNDLER_VERSION', + '-u', 'BUNDLER_SETUP', + '-u', 'RUBYOPT', + ] + sh("cd #{Shellwords.escape(ROOT)} && #{(env_parts + parts).shelljoin}") end def flavor_config(flavor) @@ -144,12 +153,16 @@ def build_ios_flavor(flavor, options, build_native: true) require_macos! info = release_info(options) config = flavor_config(flavor) + export_options = File.join(ROOT, 'ios', "ExportOptions.#{flavor}-ad-hoc.plist") run_from_root(['./scripts/build_ios.sh']) if build_native - run_from_root( - ['flutter', 'build', 'ipa', '--flavor', flavor, '--export-method', 'app-store'] + - flutter_build_args(info), - ) + build_args = ['flutter', 'build', 'ipa', '--flavor', flavor] + build_args += if File.file?(export_options) + ['--export-options-plist', export_options] + else + ['--export-method', 'app-store'] + end + run_from_root(build_args + flutter_build_args(info)) source = latest_ipa UI.user_error!("#{flavor.capitalize} IPA was not found") unless source diff --git a/ios/ExportOptions.production-ad-hoc.plist b/ios/ExportOptions.production-ad-hoc.plist new file mode 100644 index 0000000..fd15582 --- /dev/null +++ b/ios/ExportOptions.production-ad-hoc.plist @@ -0,0 +1,25 @@ + + + + + method + ad-hoc + signingStyle + manual + signingCertificate + Apple Distribution + teamID + QL6TB358UB + provisioningProfiles + + org.parres.whitenoise + ebd3016f-3e7f-4027-981f-9b8ec6ccc79b + org.parres.whitenoise.NotificationService + 679ea0f5-f4d1-4134-865f-23619bcb006d + + compileBitcode + + stripSwiftSymbols + + + diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b050009..2b336ae 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -13,9 +13,6 @@ PODS: - flutter_secure_storage_darwin (10.0.0): - Flutter - FlutterMacOS - - gal (1.0.0): - - Flutter - - FlutterMacOS - image_picker_ios (0.0.1): - Flutter - integration_test (0.0.1): @@ -55,7 +52,6 @@ DEPENDENCIES: - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`) - - gal (from `.symlinks/plugins/gal/darwin`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - integration_test (from `.symlinks/plugins/integration_test/ios`) - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`) @@ -85,8 +81,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_native_splash/ios" flutter_secure_storage_darwin: :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin" - gal: - :path: ".symlinks/plugins/gal/darwin" image_picker_ios: :path: ".symlinks/plugins/image_picker_ios/ios" integration_test: @@ -122,7 +116,6 @@ SPEC CHECKSUMS: flutter_local_notifications: 643a3eda1ce1c0599413ca31672536d423dee214 flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23 - gal: baecd024ebfd13c441269ca7404792a7152fde89 image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 92ce142..aed2767 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -694,7 +694,9 @@ KEYCHAIN_ACCESS_GROUP_IDENTIFIER = org.parres.whitenoise; CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_ENTITLEMENTS = WhiteNoiseNotificationServiceExtension/WhiteNoiseNotificationServiceExtension.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = QL6TB358UB; GENERATE_INFOPLIST_FILE = NO; @@ -709,6 +711,8 @@ PRODUCT_BUNDLE_IDENTIFIER = org.parres.whitenoise.NotificationService; PRODUCT_BUNDLE_PACKAGE_TYPE = "XPC!"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = "679ea0f5-f4d1-4134-865f-23619bcb006d"; + PROVISIONING_PROFILE_SPECIFIER = "WN Production NotificationService Ad Hoc"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -893,7 +897,9 @@ KEYCHAIN_ACCESS_GROUP_IDENTIFIER = org.parres.whitenoise; CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_ENTITLEMENTS = WhiteNoiseNotificationServiceExtension/WhiteNoiseNotificationServiceExtension.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = QL6TB358UB; GENERATE_INFOPLIST_FILE = NO; @@ -908,6 +914,8 @@ PRODUCT_BUNDLE_IDENTIFIER = org.parres.whitenoise.NotificationService; PRODUCT_BUNDLE_PACKAGE_TYPE = "XPC!"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = "679ea0f5-f4d1-4134-865f-23619bcb006d"; + PROVISIONING_PROFILE_SPECIFIER = "WN Production NotificationService Ad Hoc"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -1134,6 +1142,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = production; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEEPLINK_SCHEME = "whitenoise"; DEVELOPMENT_TEAM = QL6TB358UB; @@ -1145,6 +1156,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.parres.whitenoise; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = "ebd3016f-3e7f-4027-981f-9b8ec6ccc79b"; + PROVISIONING_PROFILE_SPECIFIER = "WN Production App Ad Hoc"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1220,6 +1233,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = production; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEEPLINK_SCHEME = "whitenoise"; DEVELOPMENT_TEAM = QL6TB358UB; @@ -1231,6 +1247,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.parres.whitenoise; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = "ebd3016f-3e7f-4027-981f-9b8ec6ccc79b"; + PROVISIONING_PROFILE_SPECIFIER = "WN Production App Ad Hoc"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/pubspec.yaml b/pubspec.yaml index 20f808c..a793a08 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 2026.5.7+24 +version: 2026.5.22+25 environment: sdk: ^3.11.1 diff --git a/widgetbook/pubspec.lock b/widgetbook/pubspec.lock index e26d647..e518291 100644 --- a/widgetbook/pubspec.lock +++ b/widgetbook/pubspec.lock @@ -1575,7 +1575,7 @@ packages: path: ".." relative: true source: path - version: "2026.5.7+24" + version: "2026.5.22+25" widgetbook: dependency: "direct main" description: