From 6241503c8f65de18c18cc5e6ecfa803866c8de3d Mon Sep 17 00:00:00 2001 From: Rinat Enikeev Date: Fri, 24 Nov 2023 23:23:27 +0200 Subject: [PATCH] Make mergable frameworks to improve launch time (#1724) * Make mergable frameworks to increase launch time Makes all frameworks, except depending on GRDB, mergable. See https://developer.apple.com/documentation/xcode/configuring-your-project-to-use-mergeable-libraries#Manually-configure-merging. @see: https://github.com/groue/GRDB.swift/issues/642 * make MERGEABLE_LIBRARY: true --- Packages/RuuviContext/target.yml | 4 ++++ Packages/RuuviOntology/target.yml | 4 ++++ Packages/RuuviPersistence/target.yml | 4 ++++ Packages/RuuviReactor/target.yml | 4 ++++ project_frameworks.yml | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/Packages/RuuviContext/target.yml b/Packages/RuuviContext/target.yml index 88120dd40..ecb1f1d4a 100644 --- a/Packages/RuuviContext/target.yml +++ b/Packages/RuuviContext/target.yml @@ -1,6 +1,10 @@ --- targets: RuuviContext: + # https://github.com/groue/GRDB.swift/issues/642 + settings: + base: + MERGEABLE_LIBRARY: false templates: - Framework dependencies: diff --git a/Packages/RuuviOntology/target.yml b/Packages/RuuviOntology/target.yml index 889ee6667..c080d36b3 100644 --- a/Packages/RuuviOntology/target.yml +++ b/Packages/RuuviOntology/target.yml @@ -1,6 +1,10 @@ --- targets: RuuviOntology: + # https://github.com/groue/GRDB.swift/issues/642 + settings: + base: + MERGEABLE_LIBRARY: false templates: - Framework dependencies: diff --git a/Packages/RuuviPersistence/target.yml b/Packages/RuuviPersistence/target.yml index 4ad07b62f..19cff3adc 100644 --- a/Packages/RuuviPersistence/target.yml +++ b/Packages/RuuviPersistence/target.yml @@ -1,6 +1,10 @@ --- targets: RuuviPersistence: + # https://github.com/groue/GRDB.swift/issues/642 + settings: + base: + MERGEABLE_LIBRARY: false templates: - Framework dependencies: diff --git a/Packages/RuuviReactor/target.yml b/Packages/RuuviReactor/target.yml index 6474428b9..a30ebde46 100644 --- a/Packages/RuuviReactor/target.yml +++ b/Packages/RuuviReactor/target.yml @@ -1,6 +1,10 @@ --- targets: RuuviReactor: + # https://github.com/groue/GRDB.swift/issues/642 + settings: + base: + MERGEABLE_LIBRARY: false templates: - Framework dependencies: diff --git a/project_frameworks.yml b/project_frameworks.yml index ebead8436..91234f0de 100644 --- a/project_frameworks.yml +++ b/project_frameworks.yml @@ -50,6 +50,7 @@ targetTemplates: CFBundlePackageType: $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString: "$(MARKETING_VERSION)" CFBundleVersion: $(CURRENT_PROJECT_VERSION) + MERGEABLE_LIBRARY: true Module: name: "${target_name}" type: framework @@ -80,6 +81,7 @@ targetTemplates: CFBundlePackageType: $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString: "$(MARKETING_VERSION)" CFBundleVersion: $(CURRENT_PROJECT_VERSION) + MERGEABLE_LIBRARY: true CommonFramework: name: "${target_name}" type: framework @@ -110,6 +112,7 @@ targetTemplates: CFBundlePackageType: $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString: "$(MARKETING_VERSION)" CFBundleVersion: $(CURRENT_PROJECT_VERSION) + MERGEABLE_LIBRARY: true packages: BTKit: @@ -259,6 +262,7 @@ targets: UIViewControllerBasedStatusBarAppearance: true settings: base: + MERGED_BINARY_TYPE: "manual" TARGETED_DEVICE_FAMILY: 1,2 SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: true CODE_SIGN_ENTITLEMENTS: station/station.entitlements \ No newline at end of file