Merge SimplyE 3.9.5 release

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

@@ -7,7 +7,7 @@ on:
       - feature/**
 jobs:
   version-check:
-    runs-on: macOS-12
+    runs-on: macOS-13
     env:
       GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
     steps:
@@ -20,7 +20,7 @@ jobs:
       - name: Check Carthage version
         run: command -v carthage && carthage version
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Add Private Repo Auth
@@ -40,7 +40,7 @@ jobs:
       simplye_changed: ${{ steps.detectapp.outputs.simplye_changed }}
       openebooks_changed: ${{ steps.detectapp.outputs.openebooks_changed }}
   upload-arc:
-    runs-on: macOS-12
+    runs-on: macOS-13
     needs: version-check
     if: needs.version-check.outputs.simplye_changed == '1' || needs.version-check.outputs.openebooks_changed == '1'
     env:
@@ -49,13 +49,13 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Install Firebase Tools
         run: npm install -g firebase-tools
       - name: Check Firebase Tools version
         run: command -v firebase && firebase --version
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -72,7 +72,7 @@ jobs:
           GITHUB_REPO_OWNER: ${{ github.repository_owner }}
       - name: Checkout Adobe RMSDK
         if: needs.version-check.outputs.simplye_changed == '1'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

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

@@ -3,16 +3,16 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: macOS-12
+    runs-on: macOS-13
     steps:
       - name: Print System Info
         run: uname -a
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up repo for nonDRM build
         run: exec ./scripts/setup-repo-nodrm.sh
         env:

.github/workflows/unit-testing.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
 jobs:
   build-and-test:
-    runs-on: macOS-12
+    runs-on: macOS-13
     if: github.event.pull_request.head.repo.full_name == github.repository
     env:
       GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -13,14 +13,14 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Checkout Adobe RMSDK
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -52,7 +52,7 @@ jobs:
         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
+#      - name: Run Open eBooks tests
+#        run: ./scripts/xcode-test.sh openebooks
+#        env:
+#          BUILD_CONTEXT: ci

Cartfile

@@ -1,6 +1,2 @@
-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/PDFRendererProvider-iOS" "master"
-github "stephencelis/SQLite.swift" ~> 0.12.2
-github "zxingify/zxingify-objc" ~> 3.6
-github "readium/swift-toolkit" "develop"
+github "ettore/zxingify-objc" "master"

Cartfile.resolved

@@ -1,13 +1,2 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "9.4.0"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "9.4.0"
 github "NYPL-Simplified/PDFRendererProvider-iOS" "d63e6ba168cb91617a4aca5e306a92af1dd4497c"
-github "cezheng/Fuzi" "3.1.3"
-github "dexman/Minizip" "1.4.0"
-github "krzyzanowskim/CryptoSwift" "1.5.1"
-github "ra1028/DifferenceKit" "1.3.0"
-github "readium/GCDWebServer" "3.7.1"
-github "readium/swift-toolkit" "5278ddc4c12c69aa6c5946ed4a4e09c0ebf642e3"
-github "scinfu/SwiftSoup" "2.4.3"
-github "stephencelis/SQLite.swift" "0.12.2"
-github "weichsel/ZIPFoundation" "0.9.11"
-github "zxingify/zxingify-objc" "3.6.7"
+github "ettore/zxingify-objc" "a06018fc4f2120330932548fa8054e2c332dfcac"

RDServices.xcodeproj/project.pbxproj

@@ -389,7 +389,7 @@
 		118A0E201992B3FD00792DDE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1340;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = Readium;
 			};
 			buildConfigurationList = 118A0E231992B3FD00792DDE /* Build configuration list for PBXProject "RDServices" */;

RDServices.xcodeproj/xcshareddata/xcschemes/RDServices.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1340"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -10,7 +10,7 @@ Consequently, [releases](https://github.com/NYPL-Simplified/Simplified-iOS/relea
 
 # System Requirements
 
-- Install Xcode 13.4.1 in `/Applications`, open it and make sure to install additional components if it asks you.
+- Install Xcode 14.3.1 in `/Applications`, open it and make sure to install additional components if it asks you.
 - Install [Carthage](https://github.com/Carthage/Carthage) 0.38 or newer if you haven't already. Using `brew` is recommended.
 
 # Building without DRM support
@@ -54,26 +54,12 @@ cd Simplified-iOS #repo root
 ```
 The `scripts` directory contains a number of other scripts to build dependencies more granularly and also to build/test/archive the app from the command line. These scripts are the same used by our CI system. All these scripts must be run from the root of the Simplified-iOS repo, not from the `scripts` directory.
 
-# Building for Readium 2 Integration
-
-Before working on R2 integration, make sure you can build the app by following the steps listed above.
-
-For working on integrating R2 into SimplyE, first clone the following repo as a sibling of `Simplified-iOS` on the file system:
-```bash
-cd Simplified-iOS/..
-git clone https://github.com/readium/swift-toolkit
-```
-Then rebuild the dependencies:
-```bash
-cd Simplified-iOS
-./scripts/build-carthage-R2-integration.sh
-```
-Finally, open `SimplifiedR2.workspace` and use the `SimplyE-R2dev` target to build the app.
-
 # Building Open eBooks
 
 Open eBooks is an app primarily targeted toward the education space. It requires DRM. Follow the same steps as indicated above and use the "Open eBooks" Xcode target.
 
+NOTE: the Open eBooks target needs to be upgraded to match SimplyE's.
+
 # Contributing
 
 This codebase follows Google's [Swift](https://google.github.io/swift/) and [Objective-C](https://google.github.io/styleguide/objcguide.xml) style guides, including the use of two-space indentation. More details are available in [our wiki](https://github.com/NYPL-Simplified/Simplified/wiki/Mobile-client-applications#code-style-1).
@@ -96,7 +82,7 @@ Feature branch names (for features whose development is a month or more): `featu
 
 # License
 
-Copyright © 2015-2022 The New York Public Library, Astor, Lenox, and Tilden Foundations
+Copyright © 2015-2023 The New York Public Library, Astor, Lenox, and Tilden Foundations
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.