diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 88407c0..0000000 --- a/Cartfile +++ /dev/null @@ -1,2 +0,0 @@ -github "ReactiveX/RxSwift" ~> 5.1 -github "uber/RIBs" "0.9.2" diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 6e0693b..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,2 +0,0 @@ -github "ReactiveX/RxSwift" "5.1.3" -github "uber/RIBs" "0.9.2" diff --git a/DeploymentTarget.xcconfig b/DeploymentTarget.xcconfig deleted file mode 100644 index 4728300..0000000 --- a/DeploymentTarget.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -// Xcode 15+ removed libarclite; dependencies must target iOS 12+. -IPHONEOS_DEPLOYMENT_TARGET = 13.0 diff --git a/README.md b/README.md index 3fd9f00..7348b9e 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,6 @@ Real Time viewing attached RIBs Tree on Browser ## Quick start (local tooling) -From a clean clone — **no Carthage**: - ```shell ./scripts/verify.sh ``` @@ -62,7 +60,7 @@ This pulls [RIBs-iOS](https://github.com/uber/RIBs-iOS) 1.0+ and RxSwift 6.x aut ### XCFramework -Add the prebuilt binary (no Carthage required for consumers): +Add the prebuilt binary: ``` ./Products/RIBsTreeViewerClient.xcframework @@ -74,10 +72,6 @@ Regenerate after changing library sources: make generate_xcframeworks ``` -### Carthage (legacy) - -Carthage is **deprecated** for this repo ([#38](https://github.com/srea/RIBsTreeViewerClient/issues/38)). Prefer SPM or the XCFramework above. - ## Basic setup (iOS app, DEBUG) ```swift @@ -113,7 +107,7 @@ Use `127.0.0.1` when running the simulator on the same Mac as the WebSocket rela | `make browser-build` | Build browser bundle | | `make websocket-server` | Start WebSocket relay | -## Migration notes +## Notes -- RIBs iOS now lives at [uber/RIBs-iOS](https://github.com/uber/RIBs-iOS) (not `uber/RIBs`). -- Minimum iOS is **15** for SPM / current sources; older XCFrameworks may still show iOS 13 in metadata until regenerated. +- RIBs for iOS: [uber/RIBs-iOS](https://github.com/uber/RIBs-iOS) (the monorepo `uber/RIBs` is Android-focused). +- SPM migration tracking: [#38](https://github.com/srea/RIBsTreeViewerClient/issues/38) (completed). diff --git a/WebSocketServer/yarn.lock b/WebSocketServer/yarn.lock deleted file mode 100644 index 78bf4bb..0000000 --- a/WebSocketServer/yarn.lock +++ /dev/null @@ -1,8 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -ws@^8.18.0: - version "8.21.0" - resolved "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz" - integrity sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g== diff --git a/scripts/patch_carthage_checkouts.sh b/scripts/patch_carthage_checkouts.sh deleted file mode 100755 index 9261383..0000000 --- a/scripts/patch_carthage_checkouts.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -# Xcode 15+ removed libarclite; Carthage checkouts still target iOS 8–11. -set -euo pipefail - -ROOT="$(cd "$(dirname "$0")/.." && pwd)" -CHECKOUTS="$ROOT/Carthage/Checkouts" - -if [[ ! -d "$CHECKOUTS" ]]; then - echo "No Carthage/Checkouts directory. Run 'carthage update --no-build' first." - exit 1 -fi - -find "$CHECKOUTS" -name project.pbxproj -print0 | while IFS= read -r -d '' file; do - sed -i '' -E \ - -e 's/IPHONEOS_DEPLOYMENT_TARGET = [0-9]+\.[0-9]+;/IPHONEOS_DEPLOYMENT_TARGET = 13.0;/g' \ - -e 's/TVOS_DEPLOYMENT_TARGET = [0-9]+\.[0-9]+;/TVOS_DEPLOYMENT_TARGET = 13.0;/g' \ - -e 's/MACOSX_DEPLOYMENT_TARGET = [0-9]+\.[0-9]+;/MACOSX_DEPLOYMENT_TARGET = 10.15;/g' \ - "$file" -done - -RIBS_PBX="$CHECKOUTS/RIBs/ios/RIBs.xcodeproj/project.pbxproj" -if [[ -f "$RIBS_PBX" ]]; then - sed -i '' \ - -e 's|path = ../Carthage/Build/iOS/RxSwift.framework|path = ../../../Build/RxSwift.xcframework|g' \ - -e 's|path = ../Carthage/Build/iOS/RxRelay.framework|path = ../../../Build/RxRelay.xcframework|g' \ - -e 's|name = RxSwift.framework; path = ../../../Build/RxSwift.xcframework|name = RxSwift.xcframework; path = ../../../Build/RxSwift.xcframework|g' \ - -e 's|name = RxRelay.framework; path = ../../../Build/RxRelay.xcframework|name = RxRelay.xcframework; path = ../../../Build/RxRelay.xcframework|g' \ - -e 's|lastKnownFileType = wrapper.framework; name = RxSwift.xcframework|lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework|g' \ - -e 's|lastKnownFileType = wrapper.framework; name = RxRelay.xcframework|lastKnownFileType = wrapper.xcframework; name = RxRelay.xcframework|g' \ - -e 's#$(PRODUCTS_DIR)../Carthage/Build/iOS/#$(SRCROOT)/../../../Build#g' \ - -e 's#$(SRCROOT)/../Carthage/Build/iOS/RxSwift.framework#$(SRCROOT)/../../../Build/RxSwift.xcframework#g' \ - -e 's#$(SRCROOT)/../Carthage/Build/iOS/RxRelay.framework#$(SRCROOT)/../../../Build/RxRelay.xcframework#g' \ - -e 's|/usr/local/bin/carthage copy-frameworks|: # carthage copy-frameworks disabled for xcframework|g' \ - "$RIBS_PBX" -fi - -echo "Patched deployment targets under Carthage/Checkouts" diff --git a/scripts/verify.sh b/scripts/verify.sh index 0cbc128..d03f9ea 100755 --- a/scripts/verify.sh +++ b/scripts/verify.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Verify RIBsTreeViewerClient is in a usable state (no Carthage required). +# Verify RIBsTreeViewerClient is in a usable state. set -euo pipefail ROOT="$(cd "$(dirname "$0")/.." && pwd)"