robinwobin.dev / witchsky.app
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fixes & updates for xcode 14.3 (#369)

authored by

Paul Frazee and committed by
GitHub 70abcc48 95fb6509

+63 -38
+9
ios/Podfile
··· 69 69 ) 70 70 __apply_Xcode_12_5_M1_post_install_workaround(installer) 71 71 72 + # Required to force the pods to use the correct deploy version 73 + # See https://github.com/facebook/react-native/issues/34106 74 + installer.pods_project.targets.each do |target| 75 + target.build_configurations.each do |config| 76 + config.build_settings['SWIFT_VERSION'] = '5.0' 77 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' 78 + end 79 + end 80 + 72 81 # This is necessary for Xcode 14, because it signs resource bundles by default 73 82 # when building for devices. 74 83 installer.target_installation_results.pod_target_installation_results
+1 -1
ios/Podfile.lock
··· 917 917 TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 918 918 Yoga: 79dd7410de6f8ad73a77c868d3d368843f0c93e0 919 919 920 - PODFILE CHECKSUM: 5570c7b7d6ce7895f95d9db8a3a99b136a3f42c4 920 + PODFILE CHECKSUM: a70ccad2941a86bea1bc3ed0f6cb08a564cf7910 921 921 922 922 COCOAPODS: 1.11.3
+52 -36
ios/bluesky.xcodeproj/project.pbxproj
··· 3 3 archiveVersion = 1; 4 4 classes = { 5 5 }; 6 - objectVersion = 46; 6 + objectVersion = 53; 7 7 objects = { 8 8 9 9 /* Begin PBXBuildFile section */ 10 10 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 11 11 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 12 12 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 13 + 14F1D8D19D7FBF5995C9B32D /* libPods-bluesky.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B74BD82B16D3B7F19E5ADDA /* libPods-bluesky.a */; }; 13 14 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; }; 14 - 96905EF65AED1B983A6B3ABC /* libPods-bluesky.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-bluesky.a */; }; 15 15 B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; }; 16 16 B6BE37E812824A869C1E16F6 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FECE0FEBF1E4D88B437323C /* noop-file.swift */; }; 17 17 BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; ··· 19 19 20 20 /* Begin PBXFileReference section */ 21 21 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; }; 22 + 11FD9D89D32941D7ECE26520 /* Pods-bluesky.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bluesky.debug.xcconfig"; path = "Target Support Files/Pods-bluesky/Pods-bluesky.debug.xcconfig"; sourceTree = "<group>"; }; 22 23 13B07F961A680F5B00A75B9A /* bluesky.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = bluesky.app; sourceTree = BUILT_PRODUCTS_DIR; }; 23 24 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = bluesky/AppDelegate.h; sourceTree = "<group>"; }; 24 25 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = bluesky/AppDelegate.mm; sourceTree = "<group>"; }; ··· 26 27 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bluesky/Info.plist; sourceTree = "<group>"; }; 27 28 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bluesky/main.m; sourceTree = "<group>"; }; 28 29 4FECE0FEBF1E4D88B437323C /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "bluesky/noop-file.swift"; sourceTree = "<group>"; }; 29 - 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-bluesky.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bluesky.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 30 - 6C2E3173556A471DD304B334 /* Pods-bluesky.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bluesky.debug.xcconfig"; path = "Target Support Files/Pods-bluesky/Pods-bluesky.debug.xcconfig"; sourceTree = "<group>"; }; 31 - 7A4D352CD337FB3A3BF06240 /* Pods-bluesky.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bluesky.release.xcconfig"; path = "Target Support Files/Pods-bluesky/Pods-bluesky.release.xcconfig"; sourceTree = "<group>"; }; 30 + 5B74BD82B16D3B7F19E5ADDA /* libPods-bluesky.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bluesky.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 32 31 AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = bluesky/SplashScreen.storyboard; sourceTree = "<group>"; }; 33 32 BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; }; 33 + C92ECE114C152498B9DF0C14 /* Pods-bluesky.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bluesky.release.xcconfig"; path = "Target Support Files/Pods-bluesky/Pods-bluesky.release.xcconfig"; sourceTree = "<group>"; }; 34 34 ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; 35 35 FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-bluesky/ExpoModulesProvider.swift"; sourceTree = "<group>"; }; 36 36 /* End PBXFileReference section */ ··· 40 40 isa = PBXFrameworksBuildPhase; 41 41 buildActionMask = 2147483647; 42 42 files = ( 43 - 96905EF65AED1B983A6B3ABC /* libPods-bluesky.a in Frameworks */, 43 + 14F1D8D19D7FBF5995C9B32D /* libPods-bluesky.a in Frameworks */, 44 44 ); 45 45 runOnlyForDeploymentPostprocessing = 0; 46 46 }; ··· 67 67 isa = PBXGroup; 68 68 children = ( 69 69 ED297162215061F000B7C4FE /* JavaScriptCore.framework */, 70 - 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-bluesky.a */, 70 + 5B74BD82B16D3B7F19E5ADDA /* libPods-bluesky.a */, 71 71 ); 72 72 name = Frameworks; 73 73 sourceTree = "<group>"; ··· 122 122 D65327D7A22EEC0BE12398D9 /* Pods */ = { 123 123 isa = PBXGroup; 124 124 children = ( 125 - 6C2E3173556A471DD304B334 /* Pods-bluesky.debug.xcconfig */, 126 - 7A4D352CD337FB3A3BF06240 /* Pods-bluesky.release.xcconfig */, 125 + 11FD9D89D32941D7ECE26520 /* Pods-bluesky.debug.xcconfig */, 126 + C92ECE114C152498B9DF0C14 /* Pods-bluesky.release.xcconfig */, 127 127 ); 128 128 path = Pods; 129 129 sourceTree = "<group>"; ··· 143 143 isa = PBXNativeTarget; 144 144 buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "bluesky" */; 145 145 buildPhases = ( 146 - 08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */, 146 + AA58FC21F429DA1C08D4849A /* [CP] Check Pods Manifest.lock */, 147 147 FD10A7F022414F080027D42C /* Start Packager */, 148 148 13B07F871A680F5B00A75B9A /* Sources */, 149 149 13B07F8C1A680F5B00A75B9A /* Frameworks */, 150 150 13B07F8E1A680F5B00A75B9A /* Resources */, 151 151 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 152 - 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */, 153 - 0FD458797140490C54BA8FEC /* [CP] Embed Pods Frameworks */, 152 + 5555462490F6788D569DDAFD /* [CP] Embed Pods Frameworks */, 153 + D9DEAD65B781F987C1B90893 /* [CP] Copy Pods Resources */, 154 154 ); 155 155 buildRules = ( 156 156 ); ··· 167 167 83CBB9F71A601CBA00E9B192 /* Project object */ = { 168 168 isa = PBXProject; 169 169 attributes = { 170 - LastUpgradeCheck = 1130; 170 + BuildIndependentTargetsInParallel = YES; 171 + LastUpgradeCheck = 1430; 171 172 TargetAttributes = { 172 173 13B07F861A680F5B00A75B9A = { 173 174 DevelopmentTeam = B3LX46C5HS; ··· 221 222 shellPath = /bin/sh; 222 223 shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n# The project root by default is one level up from the ios directory\nexport PROJECT_ROOT=\"$PROJECT_DIR\"/..\n\nif [[ \"$CONFIGURATION\" = *Debug* ]]; then\n export SKIP_BUNDLING=1\nfi\nif [[ -z \"$ENTRY_FILE\" ]]; then\n # Set the entry JS file using the bundler's entry resolution.\n export ENTRY_FILE=\"$(\"$NODE_BINARY\" -e \"require('expo/scripts/resolveAppEntry')\" $PROJECT_ROOT ios relative | tail -n 1)\"\nfi\n\n`\"$NODE_BINARY\" --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'\"`\n\n"; 223 224 }; 224 - 08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */ = { 225 + 5555462490F6788D569DDAFD /* [CP] Embed Pods Frameworks */ = { 225 226 isa = PBXShellScriptBuildPhase; 226 227 buildActionMask = 2147483647; 227 228 files = ( 228 229 ); 229 - inputFileListPaths = ( 230 - ); 231 230 inputPaths = ( 232 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", 233 - "${PODS_ROOT}/Manifest.lock", 231 + "${PODS_ROOT}/Target Support Files/Pods-bluesky/Pods-bluesky-frameworks.sh", 232 + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", 234 233 ); 235 - name = "[CP] Check Pods Manifest.lock"; 236 - outputFileListPaths = ( 237 - ); 234 + name = "[CP] Embed Pods Frameworks"; 238 235 outputPaths = ( 239 - "$(DERIVED_FILE_DIR)/Pods-bluesky-checkManifestLockResult.txt", 236 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", 240 237 ); 241 238 runOnlyForDeploymentPostprocessing = 0; 242 239 shellPath = /bin/sh; 243 - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; 240 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bluesky/Pods-bluesky-frameworks.sh\"\n"; 244 241 showEnvVarsInLog = 0; 245 242 }; 246 - 0FD458797140490C54BA8FEC /* [CP] Embed Pods Frameworks */ = { 243 + AA58FC21F429DA1C08D4849A /* [CP] Check Pods Manifest.lock */ = { 247 244 isa = PBXShellScriptBuildPhase; 248 245 buildActionMask = 2147483647; 249 246 files = ( 247 + ); 248 + inputFileListPaths = ( 250 249 ); 251 250 inputPaths = ( 252 - "${PODS_ROOT}/Target Support Files/Pods-bluesky/Pods-bluesky-frameworks.sh", 253 - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", 251 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", 252 + "${PODS_ROOT}/Manifest.lock", 253 + ); 254 + name = "[CP] Check Pods Manifest.lock"; 255 + outputFileListPaths = ( 254 256 ); 255 - name = "[CP] Embed Pods Frameworks"; 256 257 outputPaths = ( 257 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", 258 + "$(DERIVED_FILE_DIR)/Pods-bluesky-checkManifestLockResult.txt", 258 259 ); 259 260 runOnlyForDeploymentPostprocessing = 0; 260 261 shellPath = /bin/sh; 261 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bluesky/Pods-bluesky-frameworks.sh\"\n"; 262 + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; 262 263 showEnvVarsInLog = 0; 263 264 }; 264 - 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { 265 + D9DEAD65B781F987C1B90893 /* [CP] Copy Pods Resources */ = { 265 266 isa = PBXShellScriptBuildPhase; 266 267 buildActionMask = 2147483647; 267 268 files = ( ··· 327 328 /* Begin XCBuildConfiguration section */ 328 329 13B07F941A680F5B00A75B9A /* Debug */ = { 329 330 isa = XCBuildConfiguration; 330 - baseConfigurationReference = 6C2E3173556A471DD304B334 /* Pods-bluesky.debug.xcconfig */; 331 + baseConfigurationReference = 11FD9D89D32941D7ECE26520 /* Pods-bluesky.debug.xcconfig */; 331 332 buildSettings = { 332 333 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 333 334 CLANG_ENABLE_MODULES = YES; ··· 341 342 ); 342 343 INFOPLIST_FILE = bluesky/Info.plist; 343 344 IPHONEOS_DEPLOYMENT_TARGET = 13.0; 344 - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 345 + LD_RUNPATH_SEARCH_PATHS = ( 346 + "$(inherited)", 347 + "@executable_path/Frameworks", 348 + ); 345 349 MARKETING_VERSION = 1.0; 346 350 OTHER_LDFLAGS = ( 347 351 "$(inherited)", ··· 363 367 }; 364 368 13B07F951A680F5B00A75B9A /* Release */ = { 365 369 isa = XCBuildConfiguration; 366 - baseConfigurationReference = 7A4D352CD337FB3A3BF06240 /* Pods-bluesky.release.xcconfig */; 370 + baseConfigurationReference = C92ECE114C152498B9DF0C14 /* Pods-bluesky.release.xcconfig */; 367 371 buildSettings = { 368 372 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 369 373 CLANG_ENABLE_MODULES = YES; ··· 372 376 DEVELOPMENT_TEAM = B3LX46C5HS; 373 377 INFOPLIST_FILE = bluesky/Info.plist; 374 378 IPHONEOS_DEPLOYMENT_TARGET = 13.0; 375 - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 379 + LD_RUNPATH_SEARCH_PATHS = ( 380 + "$(inherited)", 381 + "@executable_path/Frameworks", 382 + ); 376 383 MARKETING_VERSION = 1.0; 377 384 OTHER_LDFLAGS = ( 378 385 "$(inherited)", ··· 414 421 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; 415 422 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; 416 423 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; 424 + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; 417 425 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; 418 426 CLANG_WARN_STRICT_PROTOTYPES = YES; 419 427 CLANG_WARN_SUSPICIOUS_MOVE = YES; ··· 440 448 GCC_WARN_UNUSED_FUNCTION = YES; 441 449 GCC_WARN_UNUSED_VARIABLE = YES; 442 450 IPHONEOS_DEPLOYMENT_TARGET = 13.0; 443 - LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; 451 + LD_RUNPATH_SEARCH_PATHS = ( 452 + /usr/lib/swift, 453 + "$(inherited)", 454 + ); 444 455 LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; 445 456 MTL_ENABLE_DEBUG_INFO = YES; 446 457 ONLY_ACTIVE_ARCH = YES; ··· 472 483 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; 473 484 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; 474 485 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; 486 + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; 475 487 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; 476 488 CLANG_WARN_STRICT_PROTOTYPES = YES; 477 489 CLANG_WARN_SUSPICIOUS_MOVE = YES; ··· 491 503 GCC_WARN_UNUSED_FUNCTION = YES; 492 504 GCC_WARN_UNUSED_VARIABLE = YES; 493 505 IPHONEOS_DEPLOYMENT_TARGET = 13.0; 494 - LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; 506 + LD_RUNPATH_SEARCH_PATHS = ( 507 + /usr/lib/swift, 508 + "$(inherited)", 509 + ); 495 510 LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; 496 511 MTL_ENABLE_DEBUG_INFO = NO; 497 512 REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; 498 513 SDKROOT = iphoneos; 514 + SWIFT_COMPILATION_MODE = wholemodule; 499 515 VALIDATE_PRODUCT = YES; 500 516 }; 501 517 name = Release;
+1 -1
ios/bluesky.xcodeproj/xcshareddata/xcschemes/bluesky.xcscheme
··· 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <Scheme 3 - LastUpgradeVersion = "1130" 3 + LastUpgradeVersion = "1430" 4 4 version = "1.3"> 5 5 <BuildAction 6 6 parallelizeBuildables = "YES"