Skip to content

Commit 4cb3584

Browse files
author
Ernest Fan
committed
Merge branch 'release/simplye/3.8.7'
2 parents cc82221 + 7ddb7a7 commit 4cb3584

78 files changed

Lines changed: 971 additions & 438 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- feature/**
88
jobs:
99
version-check:
10-
runs-on: macOS-11
10+
runs-on: macOS-12
1111
env:
1212
GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
1313
steps:
@@ -40,13 +40,13 @@ jobs:
4040
simplye_changed: ${{ steps.detectapp.outputs.simplye_changed }}
4141
openebooks_changed: ${{ steps.detectapp.outputs.openebooks_changed }}
4242
upload-arc:
43-
runs-on: macOS-11
43+
runs-on: macOS-12
4444
needs: version-check
4545
if: needs.version-check.outputs.simplye_changed == '1' || needs.version-check.outputs.openebooks_changed == '1'
4646
env:
4747
GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
4848
steps:
49-
- name: Force Xcode 13.1
49+
- name: Force Xcode 13.3.1
5050
run: sudo xcode-select -switch /Applications/Xcode_13.1.app
5151
- name: Install Firebase Tools
5252
run: npm install -g firebase-tools

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
pull_request:
44
jobs:
55
build:
6-
runs-on: macOS-11
6+
runs-on: macOS-12
77
steps:
88
- name: Check available Xcodes
99
run: ls -la /Applications
10-
- name: Force Xcode 13.1
10+
- name: Force Xcode 13.3.1
1111
run: sudo xcode-select -switch /Applications/Xcode_13.1.app
1212
- name: Checkout main repo
1313
uses: actions/checkout@v2

.github/workflows/unit-testing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ on:
33
pull_request:
44
jobs:
55
build-and-test:
6-
runs-on: macOS-11
6+
runs-on: macOS-12
77
if: github.event.pull_request.head.repo.full_name == github.repository
88
env:
99
GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
1010
steps:
11-
- name: Force Xcode 13.1
11+
- name: Force Xcode 13.3.1
1212
run: sudo xcode-select -switch /Applications/Xcode_13.1.app
1313
- name: Print System Info
1414
run: uname -a

Axis-iOS

NYPLAEToolkit

RDServices.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
118A0E201992B3FD00792DDE /* Project object */ = {
390390
isa = PBXProject;
391391
attributes = {
392-
LastUpgradeCheck = 1310;
392+
LastUpgradeCheck = 1330;
393393
ORGANIZATIONNAME = Readium;
394394
};
395395
buildConfigurationList = 118A0E231992B3FD00792DDE /* Build configuration list for PBXProject "RDServices" */;

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 = "1310"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Simplified.xcodeproj/project.pbxproj

Lines changed: 50 additions & 32 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)