Merge branch 'develop' into fix/remove-http-server

Author: mickael-menu

.github/workflows/build.yml

@@ -0,0 +1,31 @@
+name: R2Navigator
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+    name: Build and test
+    runs-on: macos-latest
+    env:
+      scheme: ${{ 'r2-navigator-swift' }}
+      platform: ${{ 'iOS Simulator' }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Prepare build
+        run: |
+          # r2-navigator-swift.xcodeproj is only relevant for Carthage. We remove it otherwise xcodebuild will use it.
+          rm -rf r2-navigator-swift.xcodeproj
+      - name: Build
+        run: |
+          device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
+          xcodebuild build-for-testing -scheme "$scheme" -destination "platform=$platform,name=$device"
+      - name: Test
+        run: |
+          device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
+          xcodebuild test-without-building -scheme "$scheme" -destination "platform=$platform,name=$device"

.travis.yml

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/readium/r2-navigator-swift.git", :branch => "develop" }
   s.exclude_files = ["**/Info*.plist"]
   s.requires_arc = true
-  s.resources    = ['r2-navigator-swift/Resources/**', 'r2-navigator-swift/EPUB/Resources/**']
+  s.resources    = ['r2-navigator-swift/Resources/**', 'r2-navigator-swift/EPUB/Assets']
   s.source_files  = "r2-navigator-swift/**/*.{m,h,swift}"
   s.platform     = :ios
   s.ios.deployment_target = "10.0"

Package.resolved

@@ -7,6 +7,7 @@ import Foundation
 
 #if !SWIFT_PACKAGE
 extension Bundle {
-    static let module = Bundle(identifier: "org.readium.r2-navigator-swift")!
+    /// Returns R2Navigator's bundle by querying an arbitrary type.
+    static let module = Bundle(for: EPUBNavigatorViewController.self)
 }
 #endif