Generate Carthage's project with XcodeGen

.github/workflows/build.yml

@@ -17,6 +17,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install xcodegen
+      - name: Check Carthage project
+        run: |
+          # Check that the Carthage project is up to date.
+          make carthage
+          git diff --exit-code --name-only readium-opds.xcodeproj
       - name: Prepare build
         run: |
           # readium-opds.xcodeproj is only relevant for Carthage. We remove it otherwise xcodebuild will use it.

Cartfile

@@ -1,2 +1,2 @@
 github "readium/r2-shared-swift" "develop"
-github "cezheng/Fuzi" == 3.1.3
+github "cezheng/Fuzi" ~> 3.1.3

Cartfile.resolved

@@ -1,3 +1,4 @@
 github "cezheng/Fuzi" "3.1.3"
 github "dexman/Minizip" "1.4.0"
-github "readium/r2-shared-swift" "4d1735bcf2302570817b1ab239ade24289ff7c7f"
+github "readium/r2-shared-swift" "7e99bfb4f9a2428857620a9c5a69575e4e839c83"
+github "scinfu/SwiftSoup" "2.3.2"

Makefile

@@ -0,0 +1,3 @@
+.PHONY: carthage
+carthage:
+	xcodegen -s project-carthage.yml

project-carthage-as-submodules.yml

@@ -0,0 +1,23 @@
+# Use this XcodeGen project spec when using ReadiumOPDS with Carthage as a submodule on Xcode 12.5+.
+# See https://github.com/readium/r2-testapp-swift/issues/351#issuecomment-829250100
+name: readium-opds
+options:
+  bundleIdPrefix: org.readium
+targets:
+  ReadiumOPDS:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: 
+      - path: readium-opds
+    dependencies:
+      - framework: Fuzi.framework
+      - framework: Minizip.framework
+      - framework: R2Shared.framework
+    settings:
+      PRODUCT_BUNDLE_IDENTIFIER: com.readium.readium-opds
+schemes:
+  readium-opds:
+    build:
+      targets:
+        ReadiumOPDS: all

project-carthage.yml

@@ -0,0 +1,22 @@
+name: readium-opds
+options:
+  bundleIdPrefix: org.readium
+targets:
+  ReadiumOPDS:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: 
+      - path: readium-opds
+    dependencies:
+      - framework: Carthage/Build/Fuzi.xcframework
+      - framework: Carthage/Build/Minizip.xcframework
+      - framework: Carthage/Build/R2Shared.xcframework
+    settings:
+      PRODUCT_BUNDLE_IDENTIFIER: com.readium.readium-opds
+      LIBRARY_SEARCH_PATHS: $(PROJECT_DIR)/Carthage
+schemes:
+  readium-opds:
+    build:
+      targets:
+        ReadiumOPDS: all

readium-opds.xcodeproj/xcshareddata/xcschemes/readium-opds.xcscheme

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F34B7E4C1FA35B7900534FD3"
+               BlueprintIdentifier = "D654D2F39FD851DA41234F46"
                BuildableName = "ReadiumOPDS.framework"
-               BlueprintName = "readium-opds"
+               BlueprintName = "ReadiumOPDS"
                ReferencedContainer = "container:readium-opds.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,9 +27,19 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      onlyGenerateCoverageForSpecifiedTargets = "NO"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D654D2F39FD851DA41234F46"
+            BuildableName = "ReadiumOPDS.framework"
+            BlueprintName = "ReadiumOPDS"
+            ReferencedContainer = "container:readium-opds.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -43,9 +54,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "F34B7E4C1FA35B7900534FD3"
+            BlueprintIdentifier = "D654D2F39FD851DA41234F46"
             BuildableName = "ReadiumOPDS.framework"
-            BlueprintName = "readium-opds"
+            BlueprintName = "ReadiumOPDS"
             ReferencedContainer = "container:readium-opds.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -56,15 +67,16 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "F34B7E4C1FA35B7900534FD3"
+            BlueprintIdentifier = "D654D2F39FD851DA41234F46"
             BuildableName = "ReadiumOPDS.framework"
-            BlueprintName = "readium-opds"
+            BlueprintName = "ReadiumOPDS"
             ReferencedContainer = "container:readium-opds.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">