From 4064a9b6acb9042d2ddeeac84fae17ff59113116 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 10:53:14 -0400 Subject: [PATCH 01/25] Restore distinct sub-project Sources/Demo.xcodeproj - replicates Demo target from MapboxSearch.xcodeproj - USEFUL as a separate project to validate Xcode cloud - Previously partially deleted but a few lingering references remained - Update Inject Mapbox API Token build script to fix error --- Sources/Demo.xcodeproj/project.pbxproj | 492 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/swiftpm/Package.resolved | 41 ++ .../xcshareddata/xcschemes/Demo.xcscheme | 84 +++ 5 files changed, 632 insertions(+) create mode 100644 Sources/Demo.xcodeproj/project.pbxproj create mode 100644 Sources/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 Sources/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme diff --git a/Sources/Demo.xcodeproj/project.pbxproj b/Sources/Demo.xcodeproj/project.pbxproj new file mode 100644 index 000000000..3e3e1e8ba --- /dev/null +++ b/Sources/Demo.xcodeproj/project.pbxproj @@ -0,0 +1,492 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 52; + objects = { + +/* Begin PBXBuildFile section */ + 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165D2B9A387100B9BE88 /* MapboxSearch */; }; + 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165F2B9A387100B9BE88 /* MapboxSearchUI */; }; + E6E85A0C2640199800C0EF0F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E85A0B2640199800C0EF0F /* AppDelegate.swift */; }; + E6E85A132640199800C0EF0F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E6E85A112640199800C0EF0F /* Main.storyboard */; }; + E6E85A152640199900C0EF0F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E6E85A142640199900C0EF0F /* Assets.xcassets */; }; + E6E85A182640199900C0EF0F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E6E85A162640199900C0EF0F /* LaunchScreen.storyboard */; }; + E6FC5ADB26403BDF00240BBB /* MapRootController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6FC5AD826403BDF00240BBB /* MapRootController.swift */; }; + E6FC5AEA2640418F00240BBB /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */; }; + E6FC5AEC2640418F00240BBB /* CwlPosixPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + E6AAB1F82642CA3C00B39442 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; + E6E85A082640199800C0EF0F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E6E85A0B2640199800C0EF0F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + E6E85A122640199800C0EF0F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + E6E85A142640199900C0EF0F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + E6E85A172640199900C0EF0F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + E6E85A192640199900C0EF0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E6FC5AD826403BDF00240BBB /* MapRootController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapRootController.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + E6E85A052640199800C0EF0F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */, + 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */, + E6FC5AEC2640418F00240BBB /* CwlPosixPreconditionTesting in Frameworks */, + E6FC5AEA2640418F00240BBB /* CwlPreconditionTesting in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + E6E859FF2640199800C0EF0F = { + isa = PBXGroup; + children = ( + E6E85A0A2640199800C0EF0F /* Demo */, + E6E85A092640199800C0EF0F /* Products */, + E6E85A47264019D100C0EF0F /* Frameworks */, + ); + sourceTree = ""; + }; + E6E85A092640199800C0EF0F /* Products */ = { + isa = PBXGroup; + children = ( + E6E85A082640199800C0EF0F /* Demo.app */, + ); + name = Products; + sourceTree = ""; + }; + E6E85A0A2640199800C0EF0F /* Demo */ = { + isa = PBXGroup; + children = ( + E6FC5ADC26403BEF00240BBB /* Resources */, + E6E85A0B2640199800C0EF0F /* AppDelegate.swift */, + E6FC5AD826403BDF00240BBB /* MapRootController.swift */, + E6E85A112640199800C0EF0F /* Main.storyboard */, + E6E85A162640199900C0EF0F /* LaunchScreen.storyboard */, + ); + path = Demo; + sourceTree = ""; + }; + E6E85A47264019D100C0EF0F /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + E6FC5ADC26403BEF00240BBB /* Resources */ = { + isa = PBXGroup; + children = ( + E6E85A142640199900C0EF0F /* Assets.xcassets */, + E6E85A192640199900C0EF0F /* Info.plist */, + ); + name = Resources; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + E6E85A072640199800C0EF0F /* Demo */ = { + isa = PBXNativeTarget; + buildConfigurationList = E6E85A1C2640199900C0EF0F /* Build configuration list for PBXNativeTarget "Demo" */; + buildPhases = ( + FECA460D26D3F69000BC7B18 /* Generate MapboxSearchVersion.swift */, + E6E85A042640199800C0EF0F /* Sources */, + E6E85A052640199800C0EF0F /* Frameworks */, + E6E85A062640199800C0EF0F /* Resources */, + E6FC5AE3264040D300240BBB /* Inject Mapbox API key */, + E6FC5AE42640413800240BBB /* SwiftLint */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Demo; + packageProductDependencies = ( + E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */, + E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */, + 040B165D2B9A387100B9BE88 /* MapboxSearch */, + 040B165F2B9A387100B9BE88 /* MapboxSearchUI */, + ); + productName = Demo; + productReference = E6E85A082640199800C0EF0F /* Demo.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + E6E85A002640199800C0EF0F /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1250; + LastUpgradeCheck = 1300; + TargetAttributes = { + E6E85A072640199800C0EF0F = { + CreatedOnToolsVersion = 12.5; + }; + }; + }; + buildConfigurationList = E6E85A032640199800C0EF0F /* Build configuration list for PBXProject "Demo" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ru, + ); + mainGroup = E6E859FF2640199800C0EF0F; + packageReferences = ( + E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */, + 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */, + ); + productRefGroup = E6E85A092640199800C0EF0F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + E6E85A072640199800C0EF0F /* Demo */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + E6E85A062640199800C0EF0F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E6E85A182640199900C0EF0F /* LaunchScreen.storyboard in Resources */, + E6E85A152640199900C0EF0F /* Assets.xcassets in Resources */, + E6E85A132640199800C0EF0F /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + E6FC5AE3264040D300240BBB /* Inject Mapbox API key */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)", + "$(HOME)/.mapbox", + "$(HOME)/mapbox", + "$(SRCROOT)/.mapbox", + ); + name = "Inject Mapbox API key"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Source: https://docs.mapbox.com/help/troubleshooting/private-access-token-android-and-ios/#ios\n# Look for a global file named 'mapbox' or '.mapbox' within the home directory\ntoken_file=\"${SCRIPT_INPUT_FILE_1}\"\ntoken_file2=\"${SCRIPT_INPUT_FILE_2}\"\ntoken_file3=\"${SCRIPT_INPUT_FILE_3}\"\ntoken=\"$(cat \"$token_file3\" 2>/dev/null || cat \"$token_file\" 2>/dev/null || cat \"$token_file2\" 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MBXAccessToken -string \"$token\" \"$SCRIPT_INPUT_FILE_0\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://www.mapbox.com/account/access-tokens/'\n echo \"warning: Get an access token from , then create a new file at \"$token_file3\" or \"$token_file\" or \"$token_file2\" that contains the access token.\"\nfi\n\n\n# WORKAROUND SUGGESTION: https://stackoverflow.com/a/71358898/178805\n\n"; + }; + E6FC5AE42640413800240BBB /* SwiftLint */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = SwiftLint; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [[ \"$(uname -m)\" == \"arm64\" ]]; then\n export PATH=\"/opt/homebrew/bin:${PATH}\"\nfi\nif which swiftlint >/dev/null; then\n swiftlint --config \"${SRCROOT}/../.swiftlint.yml\" --path \"${SRCROOT}/\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + showEnvVarsInLog = 0; + }; + FECA460D26D3F69000BC7B18 /* Generate MapboxSearchVersion.swift */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Generate MapboxSearchVersion.swift"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "../scripts/generate_sdk_version_swift.sh\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + E6E85A042640199800C0EF0F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E6FC5ADB26403BDF00240BBB /* MapRootController.swift in Sources */, + E6E85A0C2640199800C0EF0F /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + E6E85A112640199800C0EF0F /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + E6E85A122640199800C0EF0F /* Base */, + E6AAB1F82642CA3C00B39442 /* ru */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + E6E85A162640199900C0EF0F /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + E6E85A172640199900C0EF0F /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + E6E85A1A2640199900C0EF0F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = 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_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + E6E85A1B2640199900C0EF0F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = 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_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + 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_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + E6E85A1D2640199900C0EF0F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = GJZR2MEM28; + INFOPLIST_FILE = Demo/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0.0; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSearchDemoApplication; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + E6E85A1E2640199900C0EF0F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = GJZR2MEM28; + INFOPLIST_FILE = Demo/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0.0; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSearchDemoApplication; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + E6E85A032640199800C0EF0F /* Build configuration list for PBXProject "Demo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E6E85A1A2640199900C0EF0F /* Debug */, + E6E85A1B2640199900C0EF0F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + E6E85A1C2640199900C0EF0F /* Build configuration list for PBXNativeTarget "Demo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E6E85A1D2640199900C0EF0F /* Debug */, + E6E85A1E2640199900C0EF0F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/mapbox/mapbox-search-ios/"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = "2.0.0-rc.2"; + }; + }; + E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/mattgallagher/CwlPreconditionTesting.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 040B165D2B9A387100B9BE88 /* MapboxSearch */ = { + isa = XCSwiftPackageProductDependency; + package = 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */; + productName = MapboxSearch; + }; + 040B165F2B9A387100B9BE88 /* MapboxSearchUI */ = { + isa = XCSwiftPackageProductDependency; + package = 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */; + productName = MapboxSearchUI; + }; + E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */ = { + isa = XCSwiftPackageProductDependency; + package = E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; + productName = CwlPreconditionTesting; + }; + E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */ = { + isa = XCSwiftPackageProductDependency; + package = E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; + productName = CwlPosixPreconditionTesting; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = E6E85A002640199800C0EF0F /* Project object */; +} diff --git a/Sources/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Sources/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/Sources/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..489f540c0 --- /dev/null +++ b/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,41 @@ +{ + "pins" : [ + { + "identity" : "cwlcatchexception", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mattgallagher/CwlCatchException.git", + "state" : { + "revision" : "682841464136f8c66e04afe5dbd01ab51a3a56f2", + "version" : "2.1.0" + } + }, + { + "identity" : "cwlpreconditiontesting", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git", + "state" : { + "revision" : "02b7a39a99c4da27abe03cab2053a9034379639f", + "version" : "2.0.0" + } + }, + { + "identity" : "mapbox-common-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-common-ios.git", + "state" : { + "revision" : "426f2022d2934b6ec265da5fff0d99995eb0cb8c", + "version" : "24.2.1" + } + }, + { + "identity" : "mapbox-search-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-search-ios/", + "state" : { + "revision" : "f18fe4dc2539f820a437e4ae2d473dc5b5c694b9", + "version" : "2.0.0" + } + } + ], + "version" : 2 +} diff --git a/Sources/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/Sources/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme new file mode 100644 index 000000000..1f3ad5f6c --- /dev/null +++ b/Sources/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8410858d7cf8660043d875db494ff459696b2215 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 11:13:14 -0400 Subject: [PATCH 02/25] Add ci_scripts/ci_post_clone.sh for Xcode Cloud with Sources/Demo.xcodeproj project --- ci_scripts/README.md | 6 ++++++ ci_scripts/ci_post_clone.sh | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 ci_scripts/README.md create mode 100755 ci_scripts/ci_post_clone.sh diff --git a/ci_scripts/README.md b/ci_scripts/README.md new file mode 100644 index 000000000..b5ebde44e --- /dev/null +++ b/ci_scripts/README.md @@ -0,0 +1,6 @@ +# ci_scripts + +Used for Xcode Cloud. + +Documentation: https://developer.apple.com/documentation/xcode/making-dependencies-available-to-xcode-cloud#Use-a-custom-build-script-to-install-a-third-party-dependency-or-tool + diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh new file mode 100755 index 000000000..370a587b0 --- /dev/null +++ b/ci_scripts/ci_post_clone.sh @@ -0,0 +1,3 @@ +# Support Xcode Cloud for Sources/Demo.xcodeproj +# Fetch Carthage dependencies +make dependencies From c78308924ec6a3aef2384d3b2fdf73a4d2041d05 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 11:18:17 -0400 Subject: [PATCH 03/25] Add ~/.mapbox set up for Xcode cloud --- ci_scripts/ci_post_clone.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 370a587b0..d290e124f 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -1,3 +1,7 @@ # Support Xcode Cloud for Sources/Demo.xcodeproj + +# Propagate environment secrets +echo $MAPBOX_API_TOKEN > ~/.mapbox + # Fetch Carthage dependencies make dependencies From 98661f8905488aec32746a2d004b62008eda4778 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 11:19:27 -0400 Subject: [PATCH 04/25] Add ~/.netrc set up for Xcode cloud --- ci_scripts/ci_post_clone.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index d290e124f..41e649471 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -3,5 +3,11 @@ # Propagate environment secrets echo $MAPBOX_API_TOKEN > ~/.mapbox +# Set up netrc for packages +echo "machine api.mapbox.com" >> ~/.netrc +echo "login mapbox" >> ~/.netrc +echo "password $MAPBOX_API_TOKEN" >> ~/.netrc +chmod 0600 ~/.netrc + # Fetch Carthage dependencies make dependencies From c13c01a0dd7f95e1712233fde0c3e86bf2ff3569 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 12:08:15 -0400 Subject: [PATCH 05/25] Relocate ci_scripts to triage Xcode Cloud for Sources/Demo.xcodeproj project --- Sources/ci_scripts/README.md | 13 +++++++++++++ {ci_scripts => Sources/ci_scripts}/ci_post_clone.sh | 0 ci_scripts/README.md | 6 ------ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 Sources/ci_scripts/README.md rename {ci_scripts => Sources/ci_scripts}/ci_post_clone.sh (100%) delete mode 100644 ci_scripts/README.md diff --git a/Sources/ci_scripts/README.md b/Sources/ci_scripts/README.md new file mode 100644 index 000000000..6c2b6959c --- /dev/null +++ b/Sources/ci_scripts/README.md @@ -0,0 +1,13 @@ +# ci_scripts + +Used for Xcode Cloud. + +Documentation: https://developer.apple.com/documentation/xcode/making-dependencies-available-to-xcode-cloud#Use-a-custom-build-script-to-install-a-third-party-dependency-or-tool + +### Why is this in Sources? + +Xcode Cloud requires that this directoy be co-located with the Xcode project and we are using Sources/Demo.xcodeproj to triage Xcode Cloud. + +From their documentaion: + +> Create a directory next to your Xcode project or workspace and name it ci_scripts diff --git a/ci_scripts/ci_post_clone.sh b/Sources/ci_scripts/ci_post_clone.sh similarity index 100% rename from ci_scripts/ci_post_clone.sh rename to Sources/ci_scripts/ci_post_clone.sh diff --git a/ci_scripts/README.md b/ci_scripts/README.md deleted file mode 100644 index b5ebde44e..000000000 --- a/ci_scripts/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# ci_scripts - -Used for Xcode Cloud. - -Documentation: https://developer.apple.com/documentation/xcode/making-dependencies-available-to-xcode-cloud#Use-a-custom-build-script-to-install-a-third-party-dependency-or-tool - From 1f76d7c97318ccfc8c5a5c85b17ac8d6f80ddb71 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 12:11:50 -0400 Subject: [PATCH 06/25] Fix hashbang --- Sources/ci_scripts/ci_post_clone.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/ci_scripts/ci_post_clone.sh b/Sources/ci_scripts/ci_post_clone.sh index 41e649471..1a30a36f3 100755 --- a/Sources/ci_scripts/ci_post_clone.sh +++ b/Sources/ci_scripts/ci_post_clone.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env sh + # Support Xcode Cloud for Sources/Demo.xcodeproj # Propagate environment secrets From e32301e2f387665ad8411f35cbd404c7edcd8cce Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 12:14:13 -0400 Subject: [PATCH 07/25] Exit script if token is not found --- Sources/ci_scripts/ci_post_clone.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sources/ci_scripts/ci_post_clone.sh b/Sources/ci_scripts/ci_post_clone.sh index 1a30a36f3..c9b3ec37c 100755 --- a/Sources/ci_scripts/ci_post_clone.sh +++ b/Sources/ci_scripts/ci_post_clone.sh @@ -2,6 +2,11 @@ # Support Xcode Cloud for Sources/Demo.xcodeproj +if [[ -z $MAPBOX_API_TOKEN ]];then + echo "Please provide an API token environment variable in Xcode Cloud" + exit 1 +fi + # Propagate environment secrets echo $MAPBOX_API_TOKEN > ~/.mapbox @@ -12,4 +17,5 @@ echo "password $MAPBOX_API_TOKEN" >> ~/.netrc chmod 0600 ~/.netrc # Fetch Carthage dependencies +cd ../../ make dependencies From 99f6306c222d5b37fe7a2704f75c50e49c74db5b Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 12:21:06 -0400 Subject: [PATCH 08/25] Run brew bundle install to provide build dependencies --- Sources/ci_scripts/ci_post_clone.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Sources/ci_scripts/ci_post_clone.sh b/Sources/ci_scripts/ci_post_clone.sh index c9b3ec37c..5ae40eb21 100755 --- a/Sources/ci_scripts/ci_post_clone.sh +++ b/Sources/ci_scripts/ci_post_clone.sh @@ -16,6 +16,12 @@ echo "login mapbox" >> ~/.netrc echo "password $MAPBOX_API_TOKEN" >> ~/.netrc chmod 0600 ~/.netrc -# Fetch Carthage dependencies +# Relocate to the top level directory cd ../../ + +# Set up build dependencies +brew update +brew bundle install + +# Fetch Carthage package dependencies make dependencies From b47098faad531c0a49772a38b2f4d4927deaf232 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 12 Mar 2024 12:27:59 -0400 Subject: [PATCH 09/25] Tryfix: clear carthage caches --- Sources/ci_scripts/ci_post_clone.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/ci_scripts/ci_post_clone.sh b/Sources/ci_scripts/ci_post_clone.sh index 5ae40eb21..a56366c82 100755 --- a/Sources/ci_scripts/ci_post_clone.sh +++ b/Sources/ci_scripts/ci_post_clone.sh @@ -23,5 +23,9 @@ cd ../../ brew update brew bundle install +# Clear caches +rm -rf ~/Library/Caches/carthage/ +rm -rf ~/Library/Caches/org.carthage.CarthageKit + # Fetch Carthage package dependencies make dependencies From 3b4c32f77df89e46d77c1e35522e2688ecc2417b Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 9 Apr 2024 16:17:16 -0400 Subject: [PATCH 10/25] Change Xcode Cloud netrc to use secret token --- Sources/ci_scripts/ci_post_clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/ci_scripts/ci_post_clone.sh b/Sources/ci_scripts/ci_post_clone.sh index a56366c82..a1beb7e71 100755 --- a/Sources/ci_scripts/ci_post_clone.sh +++ b/Sources/ci_scripts/ci_post_clone.sh @@ -13,7 +13,7 @@ echo $MAPBOX_API_TOKEN > ~/.mapbox # Set up netrc for packages echo "machine api.mapbox.com" >> ~/.netrc echo "login mapbox" >> ~/.netrc -echo "password $MAPBOX_API_TOKEN" >> ~/.netrc +echo "password $MAPBOX_SECRET_TOKEN" >> ~/.netrc chmod 0600 ~/.netrc # Relocate to the top level directory From a7107c268a1abcb83d05b1f638a1159a24f623e8 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 9 Apr 2024 16:34:21 -0400 Subject: [PATCH 11/25] Remove debug extension on search core type --- MapboxSearch.xcodeproj/project.pbxproj | 12 ------------ .../CoreOfflineIndexChangeEventType.swift | 18 ------------------ 2 files changed, 30 deletions(-) delete mode 100644 Sources/MapboxSearch/InternalAPI/Offline/CoreOfflineIndexChangeEventType.swift diff --git a/MapboxSearch.xcodeproj/project.pbxproj b/MapboxSearch.xcodeproj/project.pbxproj index b65450aaf..e8d2d2b08 100644 --- a/MapboxSearch.xcodeproj/project.pbxproj +++ b/MapboxSearch.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ 0477904E2B890F4E00A99528 /* search-box-retrieve-minsk.json in Resources */ = {isa = PBXBuildFile; fileRef = 0477904C2B890F4E00A99528 /* search-box-retrieve-minsk.json */; }; 0477904F2B890F4E00A99528 /* search-box-retrieve-minsk.json in Resources */ = {isa = PBXBuildFile; fileRef = 0477904C2B890F4E00A99528 /* search-box-retrieve-minsk.json */; }; 0484BCDF2BC4865C003CF408 /* OfflineIndexObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0484BCDE2BC4865C003CF408 /* OfflineIndexObserver.swift */; }; - 0484BCE22BC49A23003CF408 /* CoreOfflineIndexChangeEventType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0484BCE12BC49A23003CF408 /* CoreOfflineIndexChangeEventType.swift */; }; 048823482B6B0A9D00C770AA /* category-hotel-search-along-route-jp.json in Resources */ = {isa = PBXBuildFile; fileRef = 04AB0B7C2B6B043C00FDE7D5 /* category-hotel-search-along-route-jp.json */; }; 048823492B6B0A9D00C770AA /* category-hotel-search-along-route-jp.json in Resources */ = {isa = PBXBuildFile; fileRef = 04AB0B7C2B6B043C00FDE7D5 /* category-hotel-search-along-route-jp.json */; }; 0488234A2B6B0A9E00C770AA /* category-hotel-search-along-route-jp.json in Resources */ = {isa = PBXBuildFile; fileRef = 04AB0B7C2B6B043C00FDE7D5 /* category-hotel-search-along-route-jp.json */; }; @@ -543,7 +542,6 @@ 047790482B890A8500A99528 /* search-box-recursion.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "search-box-recursion.json"; sourceTree = ""; }; 0477904C2B890F4E00A99528 /* search-box-retrieve-minsk.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "search-box-retrieve-minsk.json"; sourceTree = ""; }; 0484BCDE2BC4865C003CF408 /* OfflineIndexObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfflineIndexObserver.swift; sourceTree = ""; }; - 0484BCE12BC49A23003CF408 /* CoreOfflineIndexChangeEventType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreOfflineIndexChangeEventType.swift; sourceTree = ""; }; 04970F8C2B7A97C900213763 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 04AB0B4A2B6AADB700FDE7D5 /* mapbox.places.san.francisco.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = mapbox.places.san.francisco.json; sourceTree = ""; }; 04AB0B792B6AF37800FDE7D5 /* DiscoverIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoverIntegrationTests.swift; sourceTree = ""; }; @@ -1056,14 +1054,6 @@ path = sbs; sourceTree = ""; }; - 0484BCE02BC49A18003CF408 /* Offline */ = { - isa = PBXGroup; - children = ( - 0484BCE12BC49A23003CF408 /* CoreOfflineIndexChangeEventType.swift */, - ); - path = Offline; - sourceTree = ""; - }; 04970F8B2B7A97C900213763 /* Resources */ = { isa = PBXGroup; children = ( @@ -1744,7 +1734,6 @@ FEEDD2C12508DFE400DC0A98 /* InternalAPI */ = { isa = PBXGroup; children = ( - 0484BCE02BC49A18003CF408 /* Offline */, 04C127562B62FFD000884325 /* Engine */, 148DE66E285777050085684D /* Common */, F98BECBB2577B9150081D3BC /* Telemetry */, @@ -2678,7 +2667,6 @@ F9E8146225418E7D00F6378E /* EventsManager.swift in Sources */, FEEDD3002508DFE400DC0A98 /* CLLocationCoordinate2DCodable.swift in Sources */, FEEDD3042508DFE400DC0A98 /* SearchResultType.swift in Sources */, - 0484BCE22BC49A23003CF408 /* CoreOfflineIndexChangeEventType.swift in Sources */, F91FD66C258CCB41008CB8E1 /* CoreResultType+Extensions.swift in Sources */, FEEDD3152508DFE400DC0A98 /* ServerSearchResult.swift in Sources */, 140E47A2298BC90E00677E30 /* Discover.swift in Sources */, diff --git a/Sources/MapboxSearch/InternalAPI/Offline/CoreOfflineIndexChangeEventType.swift b/Sources/MapboxSearch/InternalAPI/Offline/CoreOfflineIndexChangeEventType.swift deleted file mode 100644 index 0be3ffce2..000000000 --- a/Sources/MapboxSearch/InternalAPI/Offline/CoreOfflineIndexChangeEventType.swift +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright © 2024 Mapbox. All rights reserved. - -import Foundation - -extension CoreOfflineIndexChangeEventType: CustomDebugStringConvertible { - public var debugDescription: String { - switch self { - case .added: - return "Added" - case .removed: - return "Removed" - case .updated: - return "Updated" - @unknown default: - return "Unknown" - } - } -} From 3d51dd475689b069df4f34559cdfeb66e7dc95e4 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 9 Apr 2024 16:38:10 -0400 Subject: [PATCH 12/25] move ci_scripts to top level --- {Sources/ci_scripts => ci_scripts}/README.md | 0 {Sources/ci_scripts => ci_scripts}/ci_post_clone.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {Sources/ci_scripts => ci_scripts}/README.md (100%) rename {Sources/ci_scripts => ci_scripts}/ci_post_clone.sh (100%) diff --git a/Sources/ci_scripts/README.md b/ci_scripts/README.md similarity index 100% rename from Sources/ci_scripts/README.md rename to ci_scripts/README.md diff --git a/Sources/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh similarity index 100% rename from Sources/ci_scripts/ci_post_clone.sh rename to ci_scripts/ci_post_clone.sh From fc2a3c988739fb738c756a5f635549fb1c922fcb Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 9 Apr 2024 16:41:02 -0400 Subject: [PATCH 13/25] Fix post-clone script cd directory --- ci_scripts/ci_post_clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index a1beb7e71..ba15d3d7d 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -17,7 +17,7 @@ echo "password $MAPBOX_SECRET_TOKEN" >> ~/.netrc chmod 0600 ~/.netrc # Relocate to the top level directory -cd ../../ +cd ../ # Set up build dependencies brew update From 377d85807c69cc6b01b95ad19a8cdf5d49e8a34b Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 9 Apr 2024 16:54:55 -0400 Subject: [PATCH 14/25] Build with Xcode 15.3 From db808134341ae1693fe74c14ce6ba33ba31eef42 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Mon, 15 Apr 2024 10:36:05 -0400 Subject: [PATCH 15/25] Set up Demo project for Xcode Cloud, move to xcode_cloud/ - Move previous Sources/Demo.xcodeproj to new xcode_cloud directory - Fix project settings in Demo.xcodeproj to: - build and run, and fix build settings - import sources from ../Sources/Demo - mimic MapboxSearch.xcodeproj target Demo with the key difference that mapbox-search-ios is imported via SPM - Now we can validate mapbox-search-ios builds on Xcode Cloud with SPM packages - Update ci_scripts README --- Sources/Demo/DiscoverViewController.swift | 1 + Sources/Demo/en.lproj/Main.strings | 54 ++++++ .../Demo.xcodeproj/project.pbxproj | 173 +++++++++--------- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 8 +- .../xcshareddata/xcschemes/Demo.xcscheme | 0 .../ci_scripts}/README.md | 4 +- .../ci_scripts}/ci_post_clone.sh | 2 +- 9 files changed, 146 insertions(+), 96 deletions(-) create mode 100644 Sources/Demo/en.lproj/Main.strings rename {Sources => xcode_cloud}/Demo.xcodeproj/project.pbxproj (69%) rename {Sources => xcode_cloud}/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {Sources => xcode_cloud}/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {Sources => xcode_cloud}/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved (83%) rename {Sources => xcode_cloud}/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme (100%) rename {ci_scripts => xcode_cloud/ci_scripts}/README.md (50%) rename {ci_scripts => xcode_cloud/ci_scripts}/ci_post_clone.sh (98%) diff --git a/Sources/Demo/DiscoverViewController.swift b/Sources/Demo/DiscoverViewController.swift index c4d86c665..76b16f9b4 100644 --- a/Sources/Demo/DiscoverViewController.swift +++ b/Sources/Demo/DiscoverViewController.swift @@ -1,3 +1,4 @@ +import MapboxSearch import MapKit import UIKit diff --git a/Sources/Demo/en.lproj/Main.strings b/Sources/Demo/en.lproj/Main.strings new file mode 100644 index 000000000..e4dbf3083 --- /dev/null +++ b/Sources/Demo/en.lproj/Main.strings @@ -0,0 +1,54 @@ + +/* Class = "UILabel"; text = "Adjusting address location, then press 'Done' button"; ObjectID = "5vH-kY-TAX"; */ +"5vH-kY-TAX.text" = "Adjusting address location, then press 'Done' button"; + +/* Class = "UIViewController"; title = "Address Autofill"; ObjectID = "7bM-3D-K0g"; */ +"7bM-3D-K0g.title" = "Address Autofill"; + +/* Class = "UITabBarItem"; title = "Discover"; ObjectID = "FHv-mk-0xk"; */ +"FHv-mk-0xk.title" = "Discover"; + +/* Class = "UIButton"; configuration.title = "Search in this area"; ObjectID = "GC2-d5-Go6"; */ +"GC2-d5-Go6.configuration.title" = "Search in this area"; + +/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "GC2-d5-Go6"; */ +"GC2-d5-Go6.normalTitle" = "Button"; + +/* Class = "UIViewController"; title = "Place Autocomplete"; ObjectID = "MF8-kt-2CX"; */ +"MF8-kt-2CX.title" = "Place Autocomplete"; + +/* Class = "UINavigationItem"; title = "Address Autofill"; ObjectID = "fik-rE-EC5"; */ +"fik-rE-EC5.title" = "Address Autofill"; + +/* Class = "UITabBarItem"; title = "Autofill"; ObjectID = "fkh-Aj-TqY"; */ +"fkh-Aj-TqY.title" = "Autofill"; + +/* Class = "UIViewController"; title = "Discover"; ObjectID = "ggU-4h-Z4i"; */ +"ggU-4h-Z4i.title" = "Discover"; + +/* Class = "UINavigationItem"; title = "Search SDK"; ObjectID = "gxo-hE-Mx4"; */ +"gxo-hE-Mx4.title" = "Search SDK"; + +/* Class = "UILabel"; text = "Type your query in order to get Address Autofill suggestions"; ObjectID = "hS5-wN-tVM"; */ +"hS5-wN-tVM.text" = "Type your query in order to get Address Autofill suggestions"; + +/* Class = "UILabel"; text = "Type your query in order to get Address Autofill suggestions"; ObjectID = "iKd-b0-QXa"; */ +"iKd-b0-QXa.text" = "Type your query in order to get Address Autofill suggestions"; + +/* Class = "UISegmentedControl"; jyc-Lb-8Kz.segmentTitles[0] = "Parking"; ObjectID = "jyc-Lb-8Kz"; */ +"jyc-Lb-8Kz.segmentTitles[0]" = "Parking"; + +/* Class = "UISegmentedControl"; jyc-Lb-8Kz.segmentTitles[1] = "Restaurants"; ObjectID = "jyc-Lb-8Kz"; */ +"jyc-Lb-8Kz.segmentTitles[1]" = "Restaurants"; + +/* Class = "UISegmentedControl"; jyc-Lb-8Kz.segmentTitles[2] = "Museum"; ObjectID = "jyc-Lb-8Kz"; */ +"jyc-Lb-8Kz.segmentTitles[2]" = "Museum"; + +/* Class = "UITabBarItem"; title = "SearchUI"; ObjectID = "lTB-qi-YMg"; */ +"lTB-qi-YMg.title" = "SearchUI"; + +/* Class = "UITabBarItem"; title = "Autocomplete"; ObjectID = "ofb-Lf-pQ3"; */ +"ofb-Lf-pQ3.title" = "Autocomplete"; + +/* Class = "UINavigationItem"; title = "Place Autocomplete"; ObjectID = "u0i-jl-zwO"; */ +"u0i-jl-zwO.title" = "Place Autocomplete"; diff --git a/Sources/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj similarity index 69% rename from Sources/Demo.xcodeproj/project.pbxproj rename to xcode_cloud/Demo.xcodeproj/project.pbxproj index 3e3e1e8ba..7129f3d0a 100644 --- a/Sources/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -3,30 +3,46 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165D2B9A387100B9BE88 /* MapboxSearch */; }; 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165F2B9A387100B9BE88 /* MapboxSearchUI */; }; - E6E85A0C2640199800C0EF0F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E85A0B2640199800C0EF0F /* AppDelegate.swift */; }; - E6E85A132640199800C0EF0F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E6E85A112640199800C0EF0F /* Main.storyboard */; }; - E6E85A152640199900C0EF0F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E6E85A142640199900C0EF0F /* Assets.xcassets */; }; - E6E85A182640199900C0EF0F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E6E85A162640199900C0EF0F /* LaunchScreen.storyboard */; }; - E6FC5ADB26403BDF00240BBB /* MapRootController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6FC5AD826403BDF00240BBB /* MapRootController.swift */; }; + 04A4218E2BCD6CD600007D9C /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217C2BCD6CD600007D9C /* Main.strings */; }; + 04A4218F2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */; }; + 04A421902BCD6CD600007D9C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217F2BCD6CD600007D9C /* Assets.xcassets */; }; + 04A421912BCD6CD600007D9C /* DiscoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A421802BCD6CD600007D9C /* DiscoverViewController.swift */; }; + 04A421922BCD6CD600007D9C /* MapRootController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A421812BCD6CD600007D9C /* MapRootController.swift */; }; + 04A421932BCD6CD600007D9C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04A421822BCD6CD600007D9C /* LaunchScreen.storyboard */; }; + 04A421942BCD6CD600007D9C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04A421842BCD6CD600007D9C /* Main.storyboard */; }; + 04A421952BCD6CD600007D9C /* PlaceAutocompleteDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A421862BCD6CD600007D9C /* PlaceAutocompleteDetailsViewController.swift */; }; + 04A421962BCD6CD600007D9C /* AddressAutofillMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A421872BCD6CD600007D9C /* AddressAutofillMainViewController.swift */; }; + 04A421972BCD6CD600007D9C /* Munich, Germany.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 04A421882BCD6CD600007D9C /* Munich, Germany.gpx */; }; + 04A421982BCD6CD600007D9C /* AddressAutofillResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A421892BCD6CD600007D9C /* AddressAutofillResultViewController.swift */; }; + 04A421992BCD6CD600007D9C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A4218B2BCD6CD600007D9C /* AppDelegate.swift */; }; + 04A4219B2BCD6CD600007D9C /* San Carlos, California.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 04A4218D2BCD6CD600007D9C /* San Carlos, California.gpx */; }; E6FC5AEA2640418F00240BBB /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */; }; E6FC5AEC2640418F00240BBB /* CwlPosixPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - E6AAB1F82642CA3C00B39442 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; + 04A4217D2BCD6CD600007D9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = ""; }; + 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlaceAutocompleteMainViewController.swift; sourceTree = ""; }; + 04A4217F2BCD6CD600007D9C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 04A421802BCD6CD600007D9C /* DiscoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoverViewController.swift; sourceTree = ""; }; + 04A421812BCD6CD600007D9C /* MapRootController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapRootController.swift; sourceTree = ""; }; + 04A421832BCD6CD600007D9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 04A421852BCD6CD600007D9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 04A421862BCD6CD600007D9C /* PlaceAutocompleteDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlaceAutocompleteDetailsViewController.swift; sourceTree = ""; }; + 04A421872BCD6CD600007D9C /* AddressAutofillMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressAutofillMainViewController.swift; sourceTree = ""; }; + 04A421882BCD6CD600007D9C /* Munich, Germany.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Munich, Germany.gpx"; sourceTree = ""; }; + 04A421892BCD6CD600007D9C /* AddressAutofillResultViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressAutofillResultViewController.swift; sourceTree = ""; }; + 04A4218A2BCD6CD600007D9C /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; + 04A4218B2BCD6CD600007D9C /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 04A4218C2BCD6CD600007D9C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 04A4218D2BCD6CD600007D9C /* San Carlos, California.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "San Carlos, California.gpx"; sourceTree = ""; }; E6E85A082640199800C0EF0F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E6E85A0B2640199800C0EF0F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E6E85A122640199800C0EF0F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - E6E85A142640199900C0EF0F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E6E85A172640199900C0EF0F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - E6E85A192640199900C0EF0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - E6FC5AD826403BDF00240BBB /* MapRootController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapRootController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -44,10 +60,32 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 04A4217B2BCD6CD600007D9C /* Demo */ = { + isa = PBXGroup; + children = ( + 04A4217C2BCD6CD600007D9C /* Main.strings */, + 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */, + 04A4217F2BCD6CD600007D9C /* Assets.xcassets */, + 04A421802BCD6CD600007D9C /* DiscoverViewController.swift */, + 04A421812BCD6CD600007D9C /* MapRootController.swift */, + 04A421822BCD6CD600007D9C /* LaunchScreen.storyboard */, + 04A421842BCD6CD600007D9C /* Main.storyboard */, + 04A421862BCD6CD600007D9C /* PlaceAutocompleteDetailsViewController.swift */, + 04A421872BCD6CD600007D9C /* AddressAutofillMainViewController.swift */, + 04A421882BCD6CD600007D9C /* Munich, Germany.gpx */, + 04A421892BCD6CD600007D9C /* AddressAutofillResultViewController.swift */, + 04A4218B2BCD6CD600007D9C /* AppDelegate.swift */, + 04A4218C2BCD6CD600007D9C /* Info.plist */, + 04A4218D2BCD6CD600007D9C /* San Carlos, California.gpx */, + ); + name = Demo; + path = ../Sources/Demo; + sourceTree = ""; + }; E6E859FF2640199800C0EF0F = { isa = PBXGroup; children = ( - E6E85A0A2640199800C0EF0F /* Demo */, + 04A4217B2BCD6CD600007D9C /* Demo */, E6E85A092640199800C0EF0F /* Products */, E6E85A47264019D100C0EF0F /* Frameworks */, ); @@ -61,18 +99,6 @@ name = Products; sourceTree = ""; }; - E6E85A0A2640199800C0EF0F /* Demo */ = { - isa = PBXGroup; - children = ( - E6FC5ADC26403BEF00240BBB /* Resources */, - E6E85A0B2640199800C0EF0F /* AppDelegate.swift */, - E6FC5AD826403BDF00240BBB /* MapRootController.swift */, - E6E85A112640199800C0EF0F /* Main.storyboard */, - E6E85A162640199900C0EF0F /* LaunchScreen.storyboard */, - ); - path = Demo; - sourceTree = ""; - }; E6E85A47264019D100C0EF0F /* Frameworks */ = { isa = PBXGroup; children = ( @@ -80,15 +106,6 @@ name = Frameworks; sourceTree = ""; }; - E6FC5ADC26403BEF00240BBB /* Resources */ = { - isa = PBXGroup; - children = ( - E6E85A142640199900C0EF0F /* Assets.xcassets */, - E6E85A192640199900C0EF0F /* Info.plist */, - ); - name = Resources; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -96,12 +113,10 @@ isa = PBXNativeTarget; buildConfigurationList = E6E85A1C2640199900C0EF0F /* Build configuration list for PBXNativeTarget "Demo" */; buildPhases = ( - FECA460D26D3F69000BC7B18 /* Generate MapboxSearchVersion.swift */, E6E85A042640199800C0EF0F /* Sources */, E6E85A052640199800C0EF0F /* Frameworks */, E6E85A062640199800C0EF0F /* Resources */, E6FC5AE3264040D300240BBB /* Inject Mapbox API key */, - E6FC5AE42640413800240BBB /* SwiftLint */, ); buildRules = ( ); @@ -160,9 +175,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E6E85A182640199900C0EF0F /* LaunchScreen.storyboard in Resources */, - E6E85A152640199900C0EF0F /* Assets.xcassets in Resources */, - E6E85A132640199800C0EF0F /* Main.storyboard in Resources */, + 04A4219B2BCD6CD600007D9C /* San Carlos, California.gpx in Resources */, + 04A421932BCD6CD600007D9C /* LaunchScreen.storyboard in Resources */, + 04A421972BCD6CD600007D9C /* Munich, Germany.gpx in Resources */, + 04A421902BCD6CD600007D9C /* Assets.xcassets in Resources */, + 04A4218E2BCD6CD600007D9C /* Main.strings in Resources */, + 04A421942BCD6CD600007D9C /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -186,48 +204,12 @@ outputFileListPaths = ( ); outputPaths = ( + "$(DERIVED_FILE_DIR)/$(INFOPLIST_PATH)", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "# Source: https://docs.mapbox.com/help/troubleshooting/private-access-token-android-and-ios/#ios\n# Look for a global file named 'mapbox' or '.mapbox' within the home directory\ntoken_file=\"${SCRIPT_INPUT_FILE_1}\"\ntoken_file2=\"${SCRIPT_INPUT_FILE_2}\"\ntoken_file3=\"${SCRIPT_INPUT_FILE_3}\"\ntoken=\"$(cat \"$token_file3\" 2>/dev/null || cat \"$token_file\" 2>/dev/null || cat \"$token_file2\" 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MBXAccessToken -string \"$token\" \"$SCRIPT_INPUT_FILE_0\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://www.mapbox.com/account/access-tokens/'\n echo \"warning: Get an access token from , then create a new file at \"$token_file3\" or \"$token_file\" or \"$token_file2\" that contains the access token.\"\nfi\n\n\n# WORKAROUND SUGGESTION: https://stackoverflow.com/a/71358898/178805\n\n"; }; - E6FC5AE42640413800240BBB /* SwiftLint */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = SwiftLint; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "if [[ \"$(uname -m)\" == \"arm64\" ]]; then\n export PATH=\"/opt/homebrew/bin:${PATH}\"\nfi\nif which swiftlint >/dev/null; then\n swiftlint --config \"${SRCROOT}/../.swiftlint.yml\" --path \"${SRCROOT}/\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; - showEnvVarsInLog = 0; - }; - FECA460D26D3F69000BC7B18 /* Generate MapboxSearchVersion.swift */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Generate MapboxSearchVersion.swift"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "../scripts/generate_sdk_version_swift.sh\n"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -235,31 +217,44 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E6FC5ADB26403BDF00240BBB /* MapRootController.swift in Sources */, - E6E85A0C2640199800C0EF0F /* AppDelegate.swift in Sources */, + 04A421962BCD6CD600007D9C /* AddressAutofillMainViewController.swift in Sources */, + 04A4218F2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift in Sources */, + 04A421982BCD6CD600007D9C /* AddressAutofillResultViewController.swift in Sources */, + 04A421922BCD6CD600007D9C /* MapRootController.swift in Sources */, + 04A421992BCD6CD600007D9C /* AppDelegate.swift in Sources */, + 04A421912BCD6CD600007D9C /* DiscoverViewController.swift in Sources */, + 04A421952BCD6CD600007D9C /* PlaceAutocompleteDetailsViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - E6E85A112640199800C0EF0F /* Main.storyboard */ = { + 04A4217C2BCD6CD600007D9C /* Main.strings */ = { isa = PBXVariantGroup; children = ( - E6E85A122640199800C0EF0F /* Base */, - E6AAB1F82642CA3C00B39442 /* ru */, + 04A4217D2BCD6CD600007D9C /* en */, + 04A4218A2BCD6CD600007D9C /* ru */, ); - name = Main.storyboard; + name = Main.strings; sourceTree = ""; }; - E6E85A162640199900C0EF0F /* LaunchScreen.storyboard */ = { + 04A421822BCD6CD600007D9C /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - E6E85A172640199900C0EF0F /* Base */, + 04A421832BCD6CD600007D9C /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; }; + 04A421842BCD6CD600007D9C /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 04A421852BCD6CD600007D9C /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -387,7 +382,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GJZR2MEM28; - INFOPLIST_FILE = Demo/Info.plist; + INFOPLIST_FILE = ../Sources/Demo/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -408,7 +403,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GJZR2MEM28; - INFOPLIST_FILE = Demo/Info.plist; + INFOPLIST_FILE = ../Sources/Demo/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -451,8 +446,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mapbox/mapbox-search-ios/"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = "2.0.0-rc.2"; + kind = exactVersion; + version = "2.0.0-rc.3"; }; }; E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { diff --git a/Sources/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Sources/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to xcode_cloud/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 83% rename from Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 489f540c0..e00cfcc8f 100644 --- a/Sources/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "426f2022d2934b6ec265da5fff0d99995eb0cb8c", - "version" : "24.2.1" + "revision" : "15aed0b292a0fe0672113c1b69be04bd350c8bb3", + "version" : "24.3.1" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-search-ios/", "state" : { - "revision" : "f18fe4dc2539f820a437e4ae2d473dc5b5c694b9", - "version" : "2.0.0" + "revision" : "5e56456ccc6eaa68bd16e2313fdee39197800e43", + "version" : "2.0.0-rc.3" } } ], diff --git a/Sources/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/xcode_cloud/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme similarity index 100% rename from Sources/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme rename to xcode_cloud/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme diff --git a/ci_scripts/README.md b/xcode_cloud/ci_scripts/README.md similarity index 50% rename from ci_scripts/README.md rename to xcode_cloud/ci_scripts/README.md index 6c2b6959c..80d20e0ff 100644 --- a/ci_scripts/README.md +++ b/xcode_cloud/ci_scripts/README.md @@ -4,9 +4,9 @@ Used for Xcode Cloud. Documentation: https://developer.apple.com/documentation/xcode/making-dependencies-available-to-xcode-cloud#Use-a-custom-build-script-to-install-a-third-party-dependency-or-tool -### Why is this in Sources? +### Directory structure -Xcode Cloud requires that this directoy be co-located with the Xcode project and we are using Sources/Demo.xcodeproj to triage Xcode Cloud. +Xcode Cloud requires that the project files be co-located with the Xcode project. We are using a Demo.xcodeproj to triage Xcode Cloud. This Demo project mimics the Demo target within the top-level MapboxSearch.xcodeproj with the key difference that this project imports mapbox-search-ios through SPM. From their documentaion: diff --git a/ci_scripts/ci_post_clone.sh b/xcode_cloud/ci_scripts/ci_post_clone.sh similarity index 98% rename from ci_scripts/ci_post_clone.sh rename to xcode_cloud/ci_scripts/ci_post_clone.sh index ba15d3d7d..a1beb7e71 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/xcode_cloud/ci_scripts/ci_post_clone.sh @@ -17,7 +17,7 @@ echo "password $MAPBOX_SECRET_TOKEN" >> ~/.netrc chmod 0600 ~/.netrc # Relocate to the top level directory -cd ../ +cd ../../ # Set up build dependencies brew update From 54fb0d122d72a8d13e1f11c9411acc9ab84e5d0d Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Mon, 15 Apr 2024 14:11:26 -0400 Subject: [PATCH 16/25] Move DiscoverViewController from MapboxSearch target to Demo target - Validate with a git grep for customModule and confirm each interface builder file is in the appropriate module and path --- MapboxSearch.xcodeproj/project.pbxproj | 4 ++-- Sources/Demo/Base.lproj/Main.storyboard | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MapboxSearch.xcodeproj/project.pbxproj b/MapboxSearch.xcodeproj/project.pbxproj index e8d2d2b08..1f3f568b7 100644 --- a/MapboxSearch.xcodeproj/project.pbxproj +++ b/MapboxSearch.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 0405809D2BA8E67D00A54CB9 /* OwningObjectDeallocatedErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0405809C2BA8E67D00A54CB9 /* OwningObjectDeallocatedErrorTests.swift */; }; + 041DAFD92BCDA45B0071F9EB /* DiscoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B92D5D298BFD19006003C1 /* DiscoverViewController.swift */; }; 042477C32B7290F900D870D5 /* SearchEngineGeocodingIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042477C12B7290E700D870D5 /* SearchEngineGeocodingIntegrationTests.swift */; }; 042477C52B72CCB000D870D5 /* geocoding-reverse-geocoding.json in Resources */ = {isa = PBXBuildFile; fileRef = 042477C42B72CCB000D870D5 /* geocoding-reverse-geocoding.json */; }; 042477C62B72CCB000D870D5 /* geocoding-reverse-geocoding.json in Resources */ = {isa = PBXBuildFile; fileRef = 042477C42B72CCB000D870D5 /* geocoding-reverse-geocoding.json */; }; @@ -103,7 +104,6 @@ 149948EF290A8DD500E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948EE290A8DD500E7E619 /* Swifter */; }; 149948F1290A8DF900E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948F0290A8DF900E7E619 /* Swifter */; settings = {ATTRIBUTES = (Required, ); }; }; 14A0B83D2A5FF20B00D281F1 /* PlaceAutocomplet.Result+Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14A0B83B2A5FF1B300D281F1 /* PlaceAutocomplet.Result+Tests.swift */; }; - 14B92D5E298BFD19006003C1 /* DiscoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B92D5D298BFD19006003C1 /* DiscoverViewController.swift */; }; 14F71865299FD4BD00D5BC2E /* PlaceAutocomplete+PlaceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14F71864299FD4BD00D5BC2E /* PlaceAutocomplete+PlaceType.swift */; }; 14F7186B29A1361700D5BC2E /* PlaceAutocompleteMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14F7186929A1341A00D5BC2E /* PlaceAutocompleteMainViewController.swift */; }; 14F7186D29A139BF00D5BC2E /* PlaceAutocompleteDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14F7186C29A139BF00D5BC2E /* PlaceAutocompleteDetailsViewController.swift */; }; @@ -2586,7 +2586,6 @@ 14173C302878437D00B20E1C /* Country+ISO3166-1.swift in Sources */, FEEDD3162508DFE400DC0A98 /* SearchCategorySuggestion.swift in Sources */, FEEDD31D2508DFE400DC0A98 /* HighlightsCalculator.swift in Sources */, - 14B92D5E298BFD19006003C1 /* DiscoverViewController.swift in Sources */, 14FA657C2953497600056E5B /* PlaceAutocomplete+Options.swift in Sources */, F9A0B8402562B10E00CAD907 /* SearchResultMetadata.swift in Sources */, FE097B7D264EAA1A001EAC2F /* CustomNSError.swift in Sources */, @@ -2857,6 +2856,7 @@ files = ( 1440BF4F290019AD009B3679 /* AddressAutofillResultViewController.swift in Sources */, 1440BF4D28FD75A9009B3679 /* AddressAutofillMainViewController.swift in Sources */, + 041DAFD92BCDA45B0071F9EB /* DiscoverViewController.swift in Sources */, FEEDD3C32508E3CD00DC0A98 /* AppDelegate.swift in Sources */, 14F7186D29A139BF00D5BC2E /* PlaceAutocompleteDetailsViewController.swift in Sources */, FEEDD3BF2508E3CD00DC0A98 /* MapRootController.swift in Sources */, diff --git a/Sources/Demo/Base.lproj/Main.storyboard b/Sources/Demo/Base.lproj/Main.storyboard index 806f40fba..bebe11cce 100644 --- a/Sources/Demo/Base.lproj/Main.storyboard +++ b/Sources/Demo/Base.lproj/Main.storyboard @@ -248,7 +248,7 @@ - + From cf37940e49f689c85747ff961a9c033c91aa7c4d Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Mon, 15 Apr 2024 15:45:32 -0400 Subject: [PATCH 17/25] Pin mapbox common to 24.2.0 --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 17 +++++++++++++++++ .../xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index 7129f3d0a..c744a7a53 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165D2B9A387100B9BE88 /* MapboxSearch */; }; 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165F2B9A387100B9BE88 /* MapboxSearchUI */; }; + 040CD5172BCDBAA200DEB4E9 /* MapboxCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */; }; 04A4218E2BCD6CD600007D9C /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217C2BCD6CD600007D9C /* Main.strings */; }; 04A4218F2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */; }; 04A421902BCD6CD600007D9C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217F2BCD6CD600007D9C /* Assets.xcassets */; }; @@ -52,6 +53,7 @@ files = ( 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */, 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */, + 040CD5172BCDBAA200DEB4E9 /* MapboxCommon in Frameworks */, E6FC5AEC2640418F00240BBB /* CwlPosixPreconditionTesting in Frameworks */, E6FC5AEA2640418F00240BBB /* CwlPreconditionTesting in Frameworks */, ); @@ -128,6 +130,7 @@ E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */, 040B165D2B9A387100B9BE88 /* MapboxSearch */, 040B165F2B9A387100B9BE88 /* MapboxSearchUI */, + 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */, ); productName = Demo; productReference = E6E85A082640199800C0EF0F /* Demo.app */; @@ -160,6 +163,7 @@ packageReferences = ( E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */, 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */, + 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */, ); productRefGroup = E6E85A092640199800C0EF0F /* Products */; projectDirPath = ""; @@ -450,6 +454,14 @@ version = "2.0.0-rc.3"; }; }; + 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/mapbox/mapbox-common-ios.git"; + requirement = { + kind = exactVersion; + version = 24.2.0; + }; + }; E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mattgallagher/CwlPreconditionTesting.git"; @@ -471,6 +483,11 @@ package = 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */; productName = MapboxSearchUI; }; + 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */ = { + isa = XCSwiftPackageProductDependency; + package = 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */; + productName = MapboxCommon; + }; E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */ = { isa = XCSwiftPackageProductDependency; package = E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e00cfcc8f..8c13bdc0c 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "15aed0b292a0fe0672113c1b69be04bd350c8bb3", - "version" : "24.3.1" + "revision" : "72474daaeabb644edd449492f9e668f716da72e6", + "version" : "24.2.0" } }, { From 3e3c0159b8fbadecbd13332bf48a629b87018f17 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Mon, 15 Apr 2024 15:52:29 -0400 Subject: [PATCH 18/25] Change Demo XcodeCloud project to use mapbox-search-ios branch: main --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index c744a7a53..96679ed0d 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -450,8 +450,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mapbox/mapbox-search-ios/"; requirement = { - kind = exactVersion; - version = "2.0.0-rc.3"; + branch = main; + kind = branch; }; }; 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */ = { diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8c13bdc0c..4308a7c1d 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-search-ios/", "state" : { - "revision" : "5e56456ccc6eaa68bd16e2313fdee39197800e43", - "version" : "2.0.0-rc.3" + "branch" : "main", + "revision" : "284487ba5f5dc2c1b8bb694114742613e475e57f" } } ], From 7dc55025499177ae85049dfc4c9fc33d0558ff86 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Wed, 17 Apr 2024 10:15:53 -0400 Subject: [PATCH 19/25] Evaluate SSDK-736 fix for Xcode Cloud --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index 96679ed0d..cbf55d892 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -450,7 +450,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mapbox/mapbox-search-ios/"; requirement = { - branch = main; + branch = "SSDK-736-address-autofill-fixes"; kind = branch; }; }; diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4308a7c1d..a29bd2d00 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-search-ios/", "state" : { - "branch" : "main", - "revision" : "284487ba5f5dc2c1b8bb694114742613e475e57f" + "branch" : "SSDK-736-address-autofill-fixes", + "revision" : "ac5e0254f4edfda9ada56f40048a74bd7c0143a4" } } ], From 0cec5d39aef194c4724db32b97aa65fe8430cb6e Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Fri, 26 Apr 2024 14:35:12 -0400 Subject: [PATCH 20/25] Fix xcode_cloud/Demo project --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 10 +++++++--- .../xcshareddata/swiftpm/Package.resolved | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index cbf55d892..e7e54c2a6 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165D2B9A387100B9BE88 /* MapboxSearch */; }; 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165F2B9A387100B9BE88 /* MapboxSearchUI */; }; 040CD5172BCDBAA200DEB4E9 /* MapboxCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */; }; + 042C491C2BDC2AFF00B7C38D /* OfflineDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042C491B2BDC2AFF00B7C38D /* OfflineDemoViewController.swift */; }; 04A4218E2BCD6CD600007D9C /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217C2BCD6CD600007D9C /* Main.strings */; }; 04A4218F2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */; }; 04A421902BCD6CD600007D9C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217F2BCD6CD600007D9C /* Assets.xcassets */; }; @@ -28,6 +29,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 042C491B2BDC2AFF00B7C38D /* OfflineDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OfflineDemoViewController.swift; path = Offline/OfflineDemoViewController.swift; sourceTree = ""; }; 04A4217D2BCD6CD600007D9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = ""; }; 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlaceAutocompleteMainViewController.swift; sourceTree = ""; }; 04A4217F2BCD6CD600007D9C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -65,6 +67,7 @@ 04A4217B2BCD6CD600007D9C /* Demo */ = { isa = PBXGroup; children = ( + 042C491B2BDC2AFF00B7C38D /* OfflineDemoViewController.swift */, 04A4217C2BCD6CD600007D9C /* Main.strings */, 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */, 04A4217F2BCD6CD600007D9C /* Assets.xcassets */, @@ -222,6 +225,7 @@ buildActionMask = 2147483647; files = ( 04A421962BCD6CD600007D9C /* AddressAutofillMainViewController.swift in Sources */, + 042C491C2BDC2AFF00B7C38D /* OfflineDemoViewController.swift in Sources */, 04A4218F2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift in Sources */, 04A421982BCD6CD600007D9C /* AddressAutofillResultViewController.swift in Sources */, 04A421922BCD6CD600007D9C /* MapRootController.swift in Sources */, @@ -314,7 +318,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 = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -370,7 +374,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; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -450,7 +454,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mapbox/mapbox-search-ios/"; requirement = { - branch = "SSDK-736-address-autofill-fixes"; + branch = main; kind = branch; }; }; diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a29bd2d00..86f9b7c78 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "70db9fff31e5587cf66288cc5f61b187b66719b0fa9f1a09982394b45276178b", "pins" : [ { "identity" : "cwlcatchexception", @@ -32,10 +33,10 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-search-ios/", "state" : { - "branch" : "SSDK-736-address-autofill-fixes", - "revision" : "ac5e0254f4edfda9ada56f40048a74bd7c0143a4" + "branch" : "main", + "revision" : "2d4a2a4988b7bcd8c8081be5ec29d314c7edaa58" } } ], - "version" : 2 + "version" : 3 } From 0fdf41a5278d63e3449560a880cec87f9753b0b9 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 30 Apr 2024 10:42:27 -0400 Subject: [PATCH 21/25] Apply xcprivacy fix to Xcode Cloud Demo project --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index e7e54c2a6..ddaeb6ae8 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -454,7 +454,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mapbox/mapbox-search-ios/"; requirement = { - branch = main; + branch = "xcprivacy-searchcore_beta17"; kind = branch; }; }; diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 86f9b7c78..8a3a2e8d2 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-search-ios/", "state" : { - "branch" : "main", - "revision" : "2d4a2a4988b7bcd8c8081be5ec29d314c7edaa58" + "branch" : "xcprivacy-searchcore_beta17", + "revision" : "2a5ba6693b64594a155fd85a88a9c333eb6b8ec9" } } ], From f695e32c5093f619783407a96d77ee39339be1f0 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 30 Apr 2024 10:48:33 -0400 Subject: [PATCH 22/25] Update Xcode Cloud Demo app to version "2.0.0" to reflect v2 SDK usage --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index ddaeb6ae8..2700da270 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -395,7 +395,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSearchDemoApplication; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = NO; @@ -416,7 +416,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSearchDemoApplication; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = NO; From 98ea27aebeb67708ec65e6b62095d05bbff94824 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 30 Apr 2024 12:27:51 -0400 Subject: [PATCH 23/25] Build with Xcode 15.2 workflow From 00bd0f93742fe878b4568dc23ea9eaecc4293781 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 30 Apr 2024 12:30:58 -0400 Subject: [PATCH 24/25] Build with Xcode 15.2 workflow --- .../xcshareddata/swiftpm/Package.resolved | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8a3a2e8d2..0ab6f149a 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,12 @@ { - "originHash" : "70db9fff31e5587cf66288cc5f61b187b66719b0fa9f1a09982394b45276178b", "pins" : [ { "identity" : "cwlcatchexception", "kind" : "remoteSourceControl", "location" : "https://github.com/mattgallagher/CwlCatchException.git", "state" : { - "revision" : "682841464136f8c66e04afe5dbd01ab51a3a56f2", - "version" : "2.1.0" + "revision" : "3ef6999c73b6938cc0da422f2c912d0158abb0a0", + "version" : "2.2.0" } }, { @@ -15,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git", "state" : { - "revision" : "02b7a39a99c4da27abe03cab2053a9034379639f", - "version" : "2.0.0" + "revision" : "2ef56b2caf25f55fa7eef8784c30d5a767550f54", + "version" : "2.2.1" } }, { @@ -38,5 +37,5 @@ } } ], - "version" : 3 + "version" : 2 } From 82ea96f3fccdf2ca14d15794e78dbb913bc4f635 Mon Sep 17 00:00:00 2001 From: Jack Alto Date: Tue, 30 Apr 2024 17:15:25 -0400 Subject: [PATCH 25/25] Update MapboxSearch in Xcode Cloud Demo project --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index 2700da270..520c10aa6 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -462,8 +462,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mapbox/mapbox-common-ios.git"; requirement = { - kind = exactVersion; - version = 24.2.0; + kind = upToNextMajorVersion; + minimumVersion = 24.2.0; }; }; E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0ab6f149a..6218b0835 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "72474daaeabb644edd449492f9e668f716da72e6", - "version" : "24.2.0" + "revision" : "e36d6ec3c399e9f55c4deb96cea70bcd095a5203", + "version" : "24.4.0-beta.2" } }, { @@ -33,7 +33,7 @@ "location" : "https://github.com/mapbox/mapbox-search-ios/", "state" : { "branch" : "xcprivacy-searchcore_beta17", - "revision" : "2a5ba6693b64594a155fd85a88a9c333eb6b8ec9" + "revision" : "d9515aebf1780a42c553d4a1eaea317b1f0b1f54" } } ],