Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: CI

on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
browser:
runs-on: ubuntu-latest
defaults:
run:
working-directory: Browser
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: yarn
cache-dependency-path: Browser/yarn.lock
- run: yarn install --frozen-lockfile
- run: yarn build

websocket-server:
runs-on: ubuntu-latest
defaults:
run:
working-directory: WebSocketServer
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
cache-dependency-path: WebSocketServer/package-lock.json
- run: npm ci

ios:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Install Carthage
run: brew install carthage
- name: Build dependencies
run: make setup-ci
- name: Build RIBsTreeViewerClient (Simulator)
run: |
xcodebuild build \
-project RIBsTreeViewerClient.xcodeproj \
-scheme RIBsTreeViewerClient \
-destination 'generic/platform=iOS Simulator' \
-configuration Release \
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
CODE_SIGNING_ALLOWED=NO
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveX/RxSwift" "5.1.1"
github "ReactiveX/RxSwift" "5.1.3"
github "uber/RIBs" "0.9.2"
2 changes: 2 additions & 0 deletions DeploymentTarget.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Xcode 15+ removed libarclite; dependencies must target iOS 12+.
IPHONEOS_DEPLOYMENT_TARGET = 13.0
15 changes: 13 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@
help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

setup: ## setup
@carthage update --platform iOS --no-use-binaries
CARTHAGE_BUILD_FLAGS = --platform iOS --no-use-binaries --use-xcframeworks

setup: ## Fetch and build Carthage dependencies (RIBs, RxSwift).
carthage update --platform iOS --no-build
@./scripts/patch_carthage_checkouts.sh
carthage build $(CARTHAGE_BUILD_FLAGS) RxSwift RxRelay
carthage build $(CARTHAGE_BUILD_FLAGS) RIBs

setup-ci: ## Carthage bootstrap for CI (uses Cartfile.resolved).
carthage bootstrap --platform iOS --no-build --cache-builds
@./scripts/patch_carthage_checkouts.sh
carthage build $(CARTHAGE_BUILD_FLAGS) --cache-builds RxSwift RxRelay
carthage build $(CARTHAGE_BUILD_FLAGS) --cache-builds RIBs

generate_xcframeworks: ## Generate XCFrameworks.
@./scripts/generate_xcframeworks.sh
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PackageDescription

let package = Package(
name: "RIBsTreeViewerClient",
platforms: [.iOS(.v8)],
platforms: [.iOS(.v13)],
products: [
.library(name: "RIBsTreeViewerClient", targets: ["RIBsTreeViewerClient"]),
],
Expand Down
11 changes: 7 additions & 4 deletions Products/RIBsTreeViewerClient.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,31 @@
<key>AvailableLibraries</key>
<array>
<dict>
<key>BinaryPath</key>
<string>RIBsTreeViewerClient.framework/RIBsTreeViewerClient</string>
<key>LibraryIdentifier</key>
<string>ios-x86_64_i386-simulator</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>RIBsTreeViewerClient.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>i386</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>RIBsTreeViewerClient.framework/RIBsTreeViewerClient</string>
<key>LibraryIdentifier</key>
<string>ios-armv7_arm64</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>RIBsTreeViewerClient.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>armv7</string>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
Expand Down
Loading
Loading