Skip to content

Commit 9dc72f3

Browse files
authored
Generate Carthage's project with XcodeGen (#90)
1 parent e4f0c76 commit 9dc72f3

File tree

11 files changed

+227
-205
lines changed

11 files changed

+227
-205
lines changed

opds/.github/workflows/build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ jobs:
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2
20+
- name: Install dependencies
21+
run: brew install xcodegen
22+
- name: Check Carthage project
23+
run: |
24+
# Check that the Carthage project is up to date.
25+
make carthage
26+
git diff --exit-code --name-only readium-opds.xcodeproj
2027
- name: Prepare build
2128
run: |
2229
# readium-opds.xcodeproj is only relevant for Carthage. We remove it otherwise xcodebuild will use it.

opds/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "readium/r2-shared-swift" "develop"
2-
github "cezheng/Fuzi" == 3.1.3
2+
github "cezheng/Fuzi" ~> 3.1.3

opds/Cartfile.resolved

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
github "cezheng/Fuzi" "3.1.3"
22
github "dexman/Minizip" "1.4.0"
3-
github "readium/r2-shared-swift" "4d1735bcf2302570817b1ab239ade24289ff7c7f"
3+
github "readium/r2-shared-swift" "7e99bfb4f9a2428857620a9c5a69575e4e839c83"
4+
github "scinfu/SwiftSoup" "2.3.2"

opds/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.PHONY: carthage
2+
carthage:
3+
xcodegen -s project-carthage.yml
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Use this XcodeGen project spec when using ReadiumOPDS with Carthage as a submodule on Xcode 12.5+.
2+
# See https://github.com/readium/r2-testapp-swift/issues/351#issuecomment-829250100
3+
name: readium-opds
4+
options:
5+
bundleIdPrefix: org.readium
6+
targets:
7+
ReadiumOPDS:
8+
type: framework
9+
platform: iOS
10+
deploymentTarget: "10.0"
11+
sources:
12+
- path: readium-opds
13+
dependencies:
14+
- framework: Fuzi.framework
15+
- framework: Minizip.framework
16+
- framework: R2Shared.framework
17+
settings:
18+
PRODUCT_BUNDLE_IDENTIFIER: com.readium.readium-opds
19+
schemes:
20+
readium-opds:
21+
build:
22+
targets:
23+
ReadiumOPDS: all

opds/project-carthage.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: readium-opds
2+
options:
3+
bundleIdPrefix: org.readium
4+
targets:
5+
ReadiumOPDS:
6+
type: framework
7+
platform: iOS
8+
deploymentTarget: "10.0"
9+
sources:
10+
- path: readium-opds
11+
dependencies:
12+
- framework: Carthage/Build/Fuzi.xcframework
13+
- framework: Carthage/Build/Minizip.xcframework
14+
- framework: Carthage/Build/R2Shared.xcframework
15+
settings:
16+
PRODUCT_BUNDLE_IDENTIFIER: com.readium.readium-opds
17+
LIBRARY_SEARCH_PATHS: $(PROJECT_DIR)/Carthage
18+
schemes:
19+
readium-opds:
20+
build:
21+
targets:
22+
ReadiumOPDS: all

opds/readium-opds.xcodeproj/project.pbxproj

Lines changed: 146 additions & 184 deletions
Large diffs are not rendered by default.

opds/readium-opds.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

opds/readium-opds.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)