From 67b59f9ab13b065d209f4f340226f9844064d41d Mon Sep 17 00:00:00 2001 From: joe muers Date: Tue, 20 Feb 2024 09:53:24 +0000 Subject: [PATCH] Project: DEFINES_MODULE=NO, apply Xcode recommended changes. The defines module setting was throwing up a warning, and we're not importing this lib as a module anywhere so reverting this setting. Other changes are from Xcode recommended changes for Xcode 15.2. --- Lottie-Legacy.xcodeproj/project.pbxproj | 71 +++++++++++++++---- .../xcschemes/Lottie-Legacy.xcscheme | 2 +- .../xcschemes/Lottie-Legacy_macOS.xcscheme | 2 +- .../xcschemes/Lottie-Legacy_tvOS.xcscheme | 2 +- 4 files changed, 61 insertions(+), 16 deletions(-) diff --git a/Lottie-Legacy.xcodeproj/project.pbxproj b/Lottie-Legacy.xcodeproj/project.pbxproj index ea0e9bd6ef..945ae45ecf 100644 --- a/Lottie-Legacy.xcodeproj/project.pbxproj +++ b/Lottie-Legacy.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -1365,8 +1365,9 @@ 62CA59AF1E3C173B002D7188 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1340; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1520; ORGANIZATIONNAME = Airbnb; TargetAttributes = { 62CA59B71E3C173B002D7188 = { @@ -1890,6 +1891,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1903,7 +1905,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; - DEFINES_MODULE = YES; + DEFINES_MODULE = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1911,7 +1913,11 @@ INFOPLIST_FILE = Lottie/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.Lottie; PRODUCT_NAME = "Lottie-Legacy"; SKIP_INSTALL = YES; @@ -1924,7 +1930,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; - DEFINES_MODULE = YES; + DEFINES_MODULE = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1932,7 +1938,11 @@ INFOPLIST_FILE = Lottie/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.Lottie; PRODUCT_NAME = "Lottie-Legacy"; SKIP_INSTALL = YES; @@ -1943,7 +1953,9 @@ 6445B0D3207E0D4D00D84F6A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 5LL7P8E8RA; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "Lottie-Legacy"; SDKROOT = macosx; @@ -1954,7 +1966,9 @@ 6445B0D4207E0D4D00D84F6A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 5LL7P8E8RA; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "Lottie-Legacy"; SDKROOT = macosx; @@ -1966,6 +1980,7 @@ isa = XCBuildConfiguration; buildSettings = { DEVELOPMENT_TEAM = 5LL7P8E8RA; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "Lottie-Legacy"; SKIP_INSTALL = YES; @@ -1976,6 +1991,7 @@ isa = XCBuildConfiguration; buildSettings = { DEVELOPMENT_TEAM = 5LL7P8E8RA; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "Lottie-Legacy"; SKIP_INSTALL = YES; @@ -1991,10 +2007,18 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = NO; INFOPLIST_FILE = Lottie/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.Lottie; PRODUCT_NAME = "Lottie-Legacy"; SDKROOT = appletvos; @@ -2015,10 +2039,18 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = NO; INFOPLIST_FILE = Lottie/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.Lottie; PRODUCT_NAME = "Lottie-Legacy"; SDKROOT = appletvos; @@ -2043,6 +2075,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -2069,12 +2102,14 @@ GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lightricks.LottieTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -2084,14 +2119,19 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = ""; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Lottie/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.Lottie; PRODUCT_NAME = "Lottie-Legacy"; SDKROOT = macosx; @@ -2104,14 +2144,19 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = ""; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Lottie/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.Lottie; PRODUCT_NAME = "Lottie-Legacy"; SDKROOT = macosx; diff --git a/Lottie-Legacy.xcodeproj/xcshareddata/xcschemes/Lottie-Legacy.xcscheme b/Lottie-Legacy.xcodeproj/xcshareddata/xcschemes/Lottie-Legacy.xcscheme index 984f87b2aa..46aaf3a064 100644 --- a/Lottie-Legacy.xcodeproj/xcshareddata/xcschemes/Lottie-Legacy.xcscheme +++ b/Lottie-Legacy.xcodeproj/xcshareddata/xcschemes/Lottie-Legacy.xcscheme @@ -1,6 +1,6 @@