Merge pull request #1504 from NYPL-Simplified/release/simplye/3.8.0

Merge SimplyE 3.8.0 to master

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

@@ -43,13 +43,6 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
-      - name: Checkout Axis DRM
-        if: needs.version-check.outputs.openebooks_changed == '1'
-        uses: actions/[email protected]
-        with:
-          repository: NYPL-Simplified/Axis-iOS
-          token: ${{ secrets.IOS_DEV_CI_PAT }}
-          path: ./Axis-iOS
       - name: Checkout Adobe RMSDK
         if: needs.version-check.outputs.simplye_changed == '1'
         uses: actions/[email protected]
@@ -104,12 +97,6 @@ jobs:
         env:
           BUILD_CONTEXT: ci
           GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
-      - name: Upload SimplyE to iOS-binaries
-        if: needs.version-check.outputs.simplye_changed == '1' && startsWith(github.ref, 'refs/heads/release/')
-        run: ./scripts/ios-binaries-upload.sh simplye
-        env:
-          BUILD_CONTEXT: ci
-          GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Export SimplyE for App Store
         if: needs.version-check.outputs.simplye_changed == '1' && startsWith(github.ref, 'refs/heads/release/')
         run: ./scripts/xcode-export-appstore.sh simplye
@@ -142,12 +129,6 @@ jobs:
         env:
           BUILD_CONTEXT: ci
           GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
-      - name: Upload Open eBooks to iOS-binaries
-        if: needs.version-check.outputs.openebooks_changed == '1' && startsWith(github.ref, 'refs/heads/release/')
-        run: ./scripts/ios-binaries-upload.sh openebooks
-        env:
-          BUILD_CONTEXT: ci
-          GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Export Open eBooks for App Store
         if: needs.version-check.outputs.openebooks_changed == '1' && startsWith(github.ref, 'refs/heads/release/')
         run: ./scripts/xcode-export-appstore.sh openebooks

.github/workflows/unit-testing.yml

@@ -13,12 +13,6 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
-      - name: Checkout Axis DRM
-        uses: actions/[email protected]
-        with:
-          repository: NYPL-Simplified/Axis-iOS
-          token: ${{ secrets.IOS_DEV_CI_PAT }}
-          path: ./Axis-iOS
       - name: Checkout Adobe RMSDK
         uses: actions/[email protected]
         with:

.gitignore

@@ -13,4 +13,3 @@ Carthage*
 **/GoogleService-Info.plist
 **/NYPLSecrets.swift
 fastlane/report.xml
-Axis-iOS

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "CardCreator-iOS"]
 	path = CardCreator-iOS
 	url = https://github.com/NYPL-Simplified/CardCreator-iOS.git
+[submodule "Axis-iOS"]
+	path = Axis-iOS
+	url = [email protected]:NYPL-Simplified/Axis-iOS.git

Cartfile.resolved

@@ -1,6 +1,6 @@
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "8.8.0"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "8.8.0"
-github "NYPL-Simplified/NYPLAudiobookToolkit" "6fb39f329e2aee84e9e10b6a9c22fc9f0a4e1b69"
+github "NYPL-Simplified/NYPLAudiobookToolkit" "4c593a738adea7ff16d3c8dfa6c9426a43c356a7"
 github "NYPL-Simplified/PDFRendererProvider-iOS" "8ef188721398304dd19b93f83194b7492a827c48"
 github "NYPL-Simplified/audiobook-ios-overdrive" "f4416dbb4f59ead32a57c9bf409f0eb76488b82a"
 github "PureLayout/PureLayout" "v3.1.9"

RDServices.xcodeproj/project.pbxproj

@@ -602,6 +602,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DSTROOT = /tmp/RDServices.dst;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

README.md

@@ -94,7 +94,7 @@ Release branch names follow the convention: `release/simplye/<version>` or `rele
 
 Feature branch names (for features whose development is a month or more): `feature/<feature-name>`, e.g. `feature/my-new-screen`.
 
-[Continuous integration](https://github.com/NYPL-Simplified/Simplified/wiki/iOS-CI-CD) is enabled on push events on `develop`, release and feature branches. SimplyE device builds are uploaded to [iOS-binaries](https://github.com/NYPL-Simplified/iOS-binaries) and Firebase. Commits on release branches also send the same build to TestFlight.
+[Continuous integration](https://github.com/NYPL-Simplified/Simplified/wiki/iOS-CI-CD) is enabled on push events on `develop`, release and feature branches. SimplyE device builds are uploaded to Firebase and, for release builds, also to TestFlight.
 
 # License