From b2fbf7c3ee8f22900fd7490a8b51e11bdc9bd992 Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Wed, 17 Sep 2025 16:48:24 -0500 Subject: [PATCH] chore: various platforms updates (#295) --- cspell.config.yaml | 3 +++ shorebird_code_push/example/.gitignore | 2 ++ .../example/ios/Flutter/AppFrameworkInfo.plist | 2 +- shorebird_code_push/example/ios/Podfile | 2 +- shorebird_code_push/example/ios/Podfile.lock | 6 +++--- .../example/ios/Runner.xcodeproj/project.pbxproj | 6 +++--- .../xcshareddata/xcschemes/Runner.xcscheme | 3 +++ shorebird_code_push/example/macos/Podfile | 2 +- .../example/macos/Runner.xcodeproj/project.pbxproj | 8 ++++---- .../xcshareddata/xcschemes/Runner.xcscheme | 3 ++- .../example/macos/Runner/AppDelegate.swift | 6 +++++- 11 files changed, 28 insertions(+), 15 deletions(-) diff --git a/cspell.config.yaml b/cspell.config.yaml index 2bb5478..ff82809 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -20,6 +20,7 @@ words: - bidiff - bipatch - bootable + - buildlog - buildroot - bundletool - carryforward @@ -61,6 +62,8 @@ words: - sigstore - staticlib - subosito + - swiftpm + - symbolication - unbootable - Verdana - vmcode diff --git a/shorebird_code_push/example/.gitignore b/shorebird_code_push/example/.gitignore index 24476c5..6c31954 100644 --- a/shorebird_code_push/example/.gitignore +++ b/shorebird_code_push/example/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/shorebird_code_push/example/ios/Flutter/AppFrameworkInfo.plist b/shorebird_code_push/example/ios/Flutter/AppFrameworkInfo.plist index 7c56964..1dc6cf7 100644 --- a/shorebird_code_push/example/ios/Flutter/AppFrameworkInfo.plist +++ b/shorebird_code_push/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 12.0 + 13.0 diff --git a/shorebird_code_push/example/ios/Podfile b/shorebird_code_push/example/ios/Podfile index d97f17e..e51a31d 100644 --- a/shorebird_code_push/example/ios/Podfile +++ b/shorebird_code_push/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' +# platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/shorebird_code_push/example/ios/Podfile.lock b/shorebird_code_push/example/ios/Podfile.lock index 50a5530..c3dcb25 100644 --- a/shorebird_code_push/example/ios/Podfile.lock +++ b/shorebird_code_push/example/ios/Podfile.lock @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: Flutter SPEC CHECKSUMS: - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 -PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 +PODFILE CHECKSUM: 4f1c12611da7338d21589c0b2ecd6bd20b109694 -COCOAPODS: 1.16.1 +COCOAPODS: 1.16.2 diff --git a/shorebird_code_push/example/ios/Runner.xcodeproj/project.pbxproj b/shorebird_code_push/example/ios/Runner.xcodeproj/project.pbxproj index 0f5299e..9845f6a 100644 --- a/shorebird_code_push/example/ios/Runner.xcodeproj/project.pbxproj +++ b/shorebird_code_push/example/ios/Runner.xcodeproj/project.pbxproj @@ -434,7 +434,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -562,7 +562,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -611,7 +611,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/shorebird_code_push/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/shorebird_code_push/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 6ce5b0b..fa4cdb6 100644 --- a/shorebird_code_push/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/shorebird_code_push/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" shouldUseLaunchSchemeArgsEnv = "YES"> diff --git a/shorebird_code_push/example/macos/Podfile b/shorebird_code_push/example/macos/Podfile index c795730..b52666a 100644 --- a/shorebird_code_push/example/macos/Podfile +++ b/shorebird_code_push/example/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.14' +platform :osx, '10.15' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/shorebird_code_push/example/macos/Runner.xcodeproj/project.pbxproj b/shorebird_code_push/example/macos/Runner.xcodeproj/project.pbxproj index 79158a2..da45dbb 100644 --- a/shorebird_code_push/example/macos/Runner.xcodeproj/project.pbxproj +++ b/shorebird_code_push/example/macos/Runner.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -457,7 +457,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -536,7 +536,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -583,7 +583,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/shorebird_code_push/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/shorebird_code_push/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8fedab6..ac78810 100644 --- a/shorebird_code_push/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/shorebird_code_push/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ diff --git a/shorebird_code_push/example/macos/Runner/AppDelegate.swift b/shorebird_code_push/example/macos/Runner/AppDelegate.swift index d53ef64..b3c1761 100644 --- a/shorebird_code_push/example/macos/Runner/AppDelegate.swift +++ b/shorebird_code_push/example/macos/Runner/AppDelegate.swift @@ -1,9 +1,13 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } }