Skip to content

Commit 2ab69ef

Browse files
authored
Merge pull request #1628 from NYPL-Simplified/IOS-639/xcode15
IOS-639 Upgrade to Xcode 15, drop iOS 11 support, remove banned books without expiration date
2 parents 5402a9d + eb531f7 commit 2ab69ef

29 files changed

+130
-71
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Check Carthage version
2121
run: command -v carthage && carthage version
2222
- name: Checkout main repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
token: ${{ secrets.IOS_DEV_CI_PAT }}
2626
- name: Add Private Repo Auth
@@ -49,13 +49,13 @@ jobs:
4949
- name: Check available Xcodes
5050
run: ls -la /Applications | grep Xcode
5151
- name: Force Xcode we use for development
52-
run: sudo xcode-select -switch /Applications/Xcode_14.3.app
52+
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
5353
- name: Install Firebase Tools
5454
run: npm install -g firebase-tools
5555
- name: Check Firebase Tools version
5656
run: command -v firebase && firebase --version
5757
- name: Checkout main repo and submodules
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959
with:
6060
submodules: true
6161
token: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -72,7 +72,7 @@ jobs:
7272
GITHUB_REPO_OWNER: ${{ github.repository_owner }}
7373
- name: Checkout Adobe RMSDK
7474
if: needs.version-check.outputs.simplye_changed == '1'
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676
with:
7777
repository: NYPL-Simplified/DRM-iOS-AdeptConnector
7878
token: ${{ secrets.IOS_DEV_CI_PAT }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
- name: Check available Xcodes
1111
run: ls -la /Applications | grep Xcode
1212
- name: Force Xcode we use for development
13-
run: sudo xcode-select -switch /Applications/Xcode_14.3.app
13+
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
1414
- name: Checkout main repo
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Set up repo for nonDRM build
1717
run: exec ./scripts/setup-repo-nodrm.sh
1818
env:

.github/workflows/unit-testing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
- name: Check available Xcodes
1414
run: ls -la /Applications | grep Xcode
1515
- name: Force Xcode we use for development
16-
run: sudo xcode-select -switch /Applications/Xcode_14.3.app
16+
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
1717
- name: Checkout main repo and submodules
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
submodules: true
2121
token: ${{ secrets.IOS_DEV_CI_PAT }}
2222
- name: Checkout Adobe RMSDK
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
repository: NYPL-Simplified/DRM-iOS-AdeptConnector
2626
token: ${{ secrets.IOS_DEV_CI_PAT }}

Axis-iOS

NYPLAEToolkit

RDServices.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@
537537
"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/dp/public\"",
538538
"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/xml/uft/public\"",
539539
);
540-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
540+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
541541
ONLY_ACTIVE_ARCH = YES;
542542
SDKROOT = iphoneos;
543543
STRIP_INSTALLED_PRODUCT = NO;
@@ -590,7 +590,7 @@
590590
"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/dp/public\"",
591591
"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/xml/uft/public\"",
592592
);
593-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
593+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
594594
SDKROOT = iphoneos;
595595
STRIP_INSTALLED_PRODUCT = NO;
596596
VALIDATE_PRODUCT = YES;

RDServices.xcodeproj/xcshareddata/xcschemes/RDServices.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Simplified.xcodeproj/project.pbxproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4936,7 +4936,7 @@
49364936
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
49374937
GCC_WARN_UNUSED_FUNCTION = YES;
49384938
GCC_WARN_UNUSED_VARIABLE = YES;
4939-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
4939+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
49404940
ONLY_ACTIVE_ARCH = YES;
49414941
OTHER_LDFLAGS = (
49424942
"$(inherited)",
@@ -4991,7 +4991,7 @@
49914991
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
49924992
GCC_WARN_UNUSED_FUNCTION = YES;
49934993
GCC_WARN_UNUSED_VARIABLE = YES;
4994-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
4994+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
49954995
OTHER_LDFLAGS = (
49964996
"$(inherited)",
49974997
"-ObjC",
@@ -5035,6 +5035,10 @@
50355035
"@executable_path/Frameworks",
50365036
);
50375037
MARKETING_VERSION = 3.9.5;
5038+
OTHER_LDFLAGS = (
5039+
"$(inherited)",
5040+
"-ld_classic",
5041+
);
50385042
PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
50395043
PROVISIONING_PROFILE = "2e185b6c-271e-4b02-a05e-860b8c3831f6";
50405044
PROVISIONING_PROFILE_SPECIFIER = "SimplyE Development";
@@ -5084,6 +5088,10 @@
50845088
"@executable_path/Frameworks",
50855089
);
50865090
MARKETING_VERSION = 3.9.5;
5091+
OTHER_LDFLAGS = (
5092+
"$(inherited)",
5093+
"-ld_classic",
5094+
);
50875095
PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
50885096
PROVISIONING_PROFILE = "b3d9154d-70e1-48d6-a0c5-869431277a5c";
50895097
PROVISIONING_PROFILE_SPECIFIER = "SimplyE Distribution";
@@ -5177,7 +5185,7 @@
51775185
repositoryURL = "https://github.com/readium/swift-toolkit.git";
51785186
requirement = {
51795187
kind = upToNextMinorVersion;
5180-
minimumVersion = 2.6.0;
5188+
minimumVersion = 2.6.1;
51815189
};
51825190
};
51835191
73579044276BE7F2009F1ADF /* XCRemoteSwiftPackageReference "iOS-Utilities" */ = {

0 commit comments

Comments
 (0)