Merge pull request #1323 from NYPL-Simplified/release/simplye/3.6.3

Merge SimplyE 3.6.3 release

.github/workflows/archive-and-upload.yml

@@ -0,0 +1,95 @@
+name: SimplyE Build
+on: workflow_dispatch
+jobs:
+  upload-arc:
+    runs-on: macOS-latest
+    if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/feature/')
+    steps:
+      - name: Force Xcode 11.5
+        run: sudo xcode-select -switch /Applications/Xcode_11.5.app
+      - name: Install Firebase Tools
+        run: npm install -g firebase-tools
+      - name: Check Firebase Tools
+        run: command -v firebase && firebase --version
+      - name: Checkout main repo and submodules
+        uses: actions/[email protected]
+        with:
+          submodules: true
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+      - name: Checkout Adobe RMSDK
+        uses: actions/[email protected]
+        with:
+          repository: NYPL-Simplified/DRM-iOS-AdeptConnector
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+          path: ./DRM-iOS-AdeptConnector
+      - name: Checkout Certificates
+        uses: actions/[email protected]
+        with:
+          repository: NYPL-Simplified/Certificates
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+          path: ./Certificates
+      - name: Checkout NYPLAEToolkit
+        uses: actions/[email protected]
+        with:
+          repository: NYPL-Simplified/NYPLAEToolkit
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+          path: ./NYPLAEToolkit
+      - name: Fetch AudioEngine
+        run: ./NYPLAEToolkit/scripts/fetch-audioengine.sh
+      - name: Setup iOS Distribution Details
+        env:
+          BUILD_CONTEXT: ci
+          IOS_DISTR_IDENTITY_PASSPHRASE: ${{ secrets.IOS_DISTR_IDENTITY_PASSPHRASE }}
+          IOS_DISTR_IDENTITY_BASE64: ${{ secrets.IOS_DISTR_IDENTITY }}
+          FASTLANE_USER: ${{ secrets.APPLEID_USERNAME }}
+          FASTLANE_PASSWORD: ${{ secrets.APPLEID_PASSWORD }}
+          FASTLANE_SESSION: ${{ secrets.FASTLANE_SESSION }}
+        run: ./scripts/decode-install-secrets.sh simplye
+      - name: Set up repo for DRM build
+        run: exec ./scripts/setup-repo-drm.sh
+        env:
+          BUILD_CONTEXT: ci
+      - name: Build non-Carthage 3rd party dependencies
+        run: ./scripts/build-3rd-party-dependencies.sh
+        env:
+          BUILD_CONTEXT: ci
+      - name: Carthage Bootstrap
+        uses: devbotsxyz/carthage-bootstrap@v1
+        with:
+          github-token: ${{ secrets.IOS_DEV_CI_PAT }}
+          platform: iOS
+          cache: false
+          verbose: true
+      - name: Archive SimplyE
+        run: ./scripts/xcode-archive.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+      - name: Export for Ad Hoc
+        run: ./scripts/xcode-export-adhoc.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+      - name: Upload to Firebase
+        run: ./scripts/firebase-upload.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+          GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
+      - name: Upload to iOS-binaries
+        run: ./scripts/ios-binaries-upload.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+          GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
+      - name: Export for App Store
+        if: startsWith(github.ref, 'refs/heads/release/')
+        run: ./scripts/xcode-export-appstore.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+      - name: Upload to TestFlight
+        if: startsWith(github.ref, 'refs/heads/release/')
+        run: ./scripts/testflight-upload.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+          IOS_DISTR_IDENTITY_PASSPHRASE: ${{ secrets.IOS_DISTR_IDENTITY_PASSPHRASE }}
+          FASTLANE_USER: ${{ secrets.APPLEID_USERNAME }}
+          FASTLANE_PASSWORD: ${{ secrets.APPLEID_PASSWORD }}
+          FASTLANE_SESSION: ${{ secrets.FASTLANE_SESSION }}
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.APPLEID_APP_SPECIFIC_PASSWORD }}

.github/workflows/check-build-number.yml

@@ -0,0 +1,25 @@
+name: Check SimplyE Build Number
+on:
+  push:
+    branches:
+      - develop
+      - release/**
+      - feature/**
+jobs:
+  check-binaries:
+    runs-on: macOS-latest
+    steps:
+      - name: Checkout main repo
+        uses: actions/[email protected]
+        with:
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+      - name: Check Build Number
+        run: ./scripts/ios-binaries-check.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+          GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
+      - name: Trigger Archive+Upload
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: SimplyE Build
+          token: ${{ secrets.IOS_DEV_CI_PAT }}

.github/workflows/non-drm-build.yml

@@ -0,0 +1,21 @@
+name: NonDRM Build
+on:
+  pull_request:
+jobs:
+  build:
+    runs-on: macOS-latest
+    steps:
+      - name: Force Xcode 11.5
+        run: sudo xcode-select -switch /Applications/Xcode_11.5.app
+      - name: Checkout main repo
+        uses: actions/checkout@v2
+      - name: Set up repo for nonDRM build
+        run: exec ./scripts/setup-repo-nodrm.sh
+        env:
+          BUILD_CONTEXT: ci
+      - name: Build 3rd party dependencies
+        run: ./scripts/build-3rd-party-dependencies.sh --no-private
+        env:
+          BUILD_CONTEXT: ci
+      - name: Build SimplyE without DRM support
+        run: ./scripts/xcode-build-nodrm.sh

.github/workflows/unit-testing.yml

@@ -0,0 +1,58 @@
+name: Unit Tests
+on:
+  pull_request:
+jobs:
+  build-and-test:
+    runs-on: macOS-latest
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    steps:
+      - name: Force Xcode 11.5
+        run: sudo xcode-select -switch /Applications/Xcode_11.5.app
+      - name: Checkout main repo and submodules
+        uses: actions/[email protected]
+        with:
+          submodules: true
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+      - name: Checkout Adobe RMSDK
+        uses: actions/[email protected]
+        with:
+          repository: NYPL-Simplified/DRM-iOS-AdeptConnector
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+          path: ./DRM-iOS-AdeptConnector
+      - name: Checkout Certificates
+        uses: actions/[email protected]
+        with:
+          repository: NYPL-Simplified/Certificates
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+          path: ./Certificates
+      - name: Checkout NYPLAEToolkit
+        uses: actions/[email protected]
+        with:
+          repository: NYPL-Simplified/NYPLAEToolkit
+          token: ${{ secrets.IOS_DEV_CI_PAT }}
+          path: ./NYPLAEToolkit
+      - name: Fetch AudioEngine
+        run: ./NYPLAEToolkit/scripts/fetch-audioengine.sh
+      - name: Set up repo for DRM build
+        run: exec ./scripts/setup-repo-drm.sh
+        env:
+          BUILD_CONTEXT: ci
+      - name: Build non-Carthage 3rd party dependencies
+        run: ./scripts/build-3rd-party-dependencies.sh
+        env:
+          BUILD_CONTEXT: ci
+      - name: Carthage Bootstrap
+        uses: devbotsxyz/carthage-bootstrap@v1
+        with:
+          github-token: ${{ secrets.IOS_DEV_CI_PAT }}
+          platform: iOS
+          cache: false
+          verbose: true
+      - name: Run SimplyE tests
+        run: ./scripts/xcode-test.sh simplye
+        env:
+          BUILD_CONTEXT: ci
+      - name: Run Open eBooks tests
+        run: ./scripts/xcode-test.sh openebooks
+        env:
+          BUILD_CONTEXT: ci

.gitignore

@@ -9,6 +9,7 @@ Build
 adobe-rmsdk
 **/ReaderClientCert.sig
 **/APIKeys.swift
-Carthage
+Carthage*
 **/GoogleService-Info.plist
 **/NYPLSecrets.swift
+fastlane/report.xml

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "readium-sdk"]
 	path = readium-sdk
-	url = git@github.com:NYPL/readium-sdk.git
+	url = https://github.com/NYPL-Simplified/readium-sdk.git
 [submodule "readium-shared-js"]
 	path = readium-shared-js
-	url = git@github.com:readium/readium-shared-js.git
+	url = https://github.com/readium/readium-shared-js.git
 [submodule "tenprintcover-ios"]
 	path = tenprintcover-ios
-	url = git@github.com:NYPL/tenprintcover-ios.git
+	url = https://github.com/NYPL/tenprintcover-ios.git
 [submodule "adept-ios"]
 	path = adept-ios
 	url = [email protected]:NYPL/DRM-iOS-Adobe.git

Cartfile

@@ -1,10 +1,14 @@
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json"
-github "NYPL-Simplified/CardCreator-iOS" ~> 1.2
+github "NYPL-Simplified/CardCreator-iOS" "master"
 github "NYPL-Simplified/NYPLAEToolkit" "master"
 github "NYPL-Simplified/NYPLAudiobookToolkit" "master"
 github "NYPL-Simplified/PDFRendererProvider-iOS" "master"
 github "NYPL-Simplified/audiobook-ios-overdrive" "master"
 github "PureLayout/PureLayout" ~> 3.1.2
-github "stephencelis/SQLite.swift" ~> 0.11.5
+github "stephencelis/SQLite.swift" == 0.12.2
 github "zxingify/zxingify-objc" ~> 3.6
+github "NYPL-Simplified/r2-lcp-swift" "develop"
+github "NYPL-Simplified/r2-shared-swift" "develop"
+github "NYPL-Simplified/r2-streamer-swift" "develop"
+github "NYPL-Simplified/r2-navigator-swift" "develop"

Cartfile.resolved

@@ -1,10 +1,20 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "7.1.0"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "7.1.0"
-github "NYPL-Simplified/CardCreator-iOS" "v1.2.1"
-github "NYPL-Simplified/NYPLAEToolkit" "26beeab0fde7fe4112e105e012a688c68d806ae9"
-github "NYPL-Simplified/NYPLAudiobookToolkit" "e8fc7450bec441d35c540d2e395222038fa5cef0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "7.4.0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "7.6.0"
+github "NYPL-Simplified/CardCreator-iOS" "e8025727ffbd2448475cb04ae9499d9756538331"
+github "NYPL-Simplified/NYPLAEToolkit" "853c8cce3a05b4a5a6b6ae99d94cf5d32938d6ff"
+github "NYPL-Simplified/NYPLAudiobookToolkit" "337a0013df9c835bc3e8000254435dec11ced4b8"
 github "NYPL-Simplified/PDFRendererProvider-iOS" "b0ee13aa74e0d88193a401c29624dda8120a340d"
-github "NYPL-Simplified/audiobook-ios-overdrive" "26609934bd80ea1084c041d6f176b4c8ea331046"
-github "PureLayout/PureLayout" "v3.1.6"
-github "stephencelis/SQLite.swift" "0.11.6"
+github "NYPL-Simplified/audiobook-ios-overdrive" "22d95dd812342866b573eaf88d53338b0e013420"
+github "NYPL-Simplified/r2-lcp-swift" "e215aaa6281d5fc5989a1b123fa84ab381577d75"
+github "NYPL-Simplified/r2-navigator-swift" "51a8dc1154fad6ad206bda00c8f3c4002cbada0d"
+github "NYPL-Simplified/r2-shared-swift" "0871e205c32f74d28f6fa254751e61ce784451fc"
+github "NYPL-Simplified/r2-streamer-swift" "d587a8bf895b713d9b85e2dfa5c5e42c25a48b5b"
+github "PureLayout/PureLayout" "v3.1.7"
+github "cezheng/Fuzi" "3.1.2"
+github "dexman/Minizip" "1.4.0"
+github "edrlab/GCDWebServer" "3.6.2"
+github "krzyzanowskim/CryptoSwift" "1.3.1"
+github "scinfu/SwiftSoup" "2.3.2"
+github "stephencelis/SQLite.swift" "0.12.2"
+github "weichsel/ZIPFoundation" "0.9.11"
 github "zxingify/zxingify-objc" "3.6.7"

Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+