Skip to content
This repository was archived by the owner on Aug 12, 2022. It is now read-only.

Commit b1b5451

Browse files
mickael-menumickael-menu
authored
Upgrade to Readium 2.2.0 (#407)
1 parent d44e834 commit b1b5451

File tree

13 files changed

+36
-43
lines changed

13 files changed

+36
-43
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
env:
1111
platform: ${{ 'iOS Simulator' }}
12+
device: ${{ 'iPhone 13' }}
1213

1314
jobs:
1415
spm:
@@ -23,7 +24,6 @@ jobs:
2324
run: make spm
2425
- name: Build
2526
run: |
26-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
2727
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
2828
2929
spm_lcp:
@@ -39,7 +39,6 @@ jobs:
3939
run: make spm lcp=${{ secrets.LCP_URL_CARTHAGE }}
4040
- name: Build
4141
run: |
42-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
4342
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
4443
4544
carthage:
@@ -54,7 +53,6 @@ jobs:
5453
run: make carthage
5554
- name: Build
5655
run: |
57-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
5856
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
5957
6058
carthage_lcp:
@@ -70,7 +68,6 @@ jobs:
7068
run: make carthage lcp=${{ secrets.LCP_URL_CARTHAGE }}
7169
- name: Build
7270
run: |
73-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
7471
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
7572
7673
cocoapods:
@@ -85,7 +82,6 @@ jobs:
8582
run: make cocoapods
8683
- name: Build
8784
run: |
88-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
8985
xcodebuild build -workspace R2TestApp.xcworkspace -scheme R2TestApp -destination "platform=$platform,name=$device"
9086
9187
cocoapods_lcp:
@@ -101,7 +97,6 @@ jobs:
10197
run: make cocoapods lcp=${{ secrets.LCP_URL_COCOAPODS }}
10298
- name: Build
10399
run: |
104-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
105100
xcodebuild build -workspace R2TestApp.xcworkspace -scheme R2TestApp -destination "platform=$platform,name=$device"
106101
107102
dev:
@@ -116,7 +111,6 @@ jobs:
116111
run: make dev
117112
- name: Build
118113
run: |
119-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
120114
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
121115
122116
dev_lcp:
@@ -132,5 +126,4 @@ jobs:
132126
run: make dev lcp=${{ secrets.LCP_URL_CARTHAGE }}
133127
- name: Build
134128
run: |
135-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
136129
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"

‎Integrations/Carthage/Cartfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Readium 2 dependencies
2-
github "readium/r2-shared-swift" "develop"
3-
github "readium/r2-streamer-swift" "develop"
4-
github "readium/r2-navigator-swift" "develop"
5-
github "readium/r2-opds-swift" "develop"
2+
github "readium/r2-shared-swift" ~> 2.2.0
3+
github "readium/r2-streamer-swift" ~> 2.2.0
4+
github "readium/r2-navigator-swift" ~> 2.2.0
5+
github "readium/r2-opds-swift" ~> 2.2.0

‎Integrations/Carthage/Cartfile+lcp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Readium 2 dependencies
2-
github "readium/r2-shared-swift" "develop"
3-
github "readium/r2-streamer-swift" "develop"
4-
github "readium/r2-navigator-swift" "develop"
5-
github "readium/r2-opds-swift" "develop"
6-
github "readium/r2-lcp-swift" "develop"
2+
github "readium/r2-shared-swift" ~> 2.2.0
3+
github "readium/r2-streamer-swift" ~> 2.2.0
4+
github "readium/r2-navigator-swift" ~> 2.2.0
5+
github "readium/r2-opds-swift" ~> 2.2.0
6+
github "readium/r2-lcp-swift" ~> 2.2.0

‎Integrations/CocoaPods/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ target 'R2TestApp' do
44
# Comment the next line if you don't want to use dynamic frameworks
55
use_frameworks!
66

7-
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/develop/R2Shared.podspec'
8-
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/develop/R2Streamer.podspec'
9-
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/develop/R2Navigator.podspec'
10-
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/develop/ReadiumOPDS.podspec'
11-
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/develop/ReadiumLCP.podspec'
7+
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/2.2.0/R2Shared.podspec'
8+
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/2.2.0/R2Streamer.podspec'
9+
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/2.2.0/R2Navigator.podspec'
10+
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/2.2.0/ReadiumOPDS.podspec'
11+
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/2.2.0/ReadiumLCP.podspec'
1212

1313
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
1414
pod 'GRDB.swift'

‎Integrations/CocoaPods/Podfile+lcp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ target 'R2TestApp' do
44
# Comment the next line if you don't want to use dynamic frameworks
55
use_frameworks!
66

7-
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/develop/R2Shared.podspec'
8-
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/develop/R2Streamer.podspec'
9-
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/develop/R2Navigator.podspec'
10-
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/develop/ReadiumOPDS.podspec'
11-
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/develop/ReadiumLCP.podspec'
7+
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/2.2.0/R2Shared.podspec'
8+
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/2.2.0/R2Streamer.podspec'
9+
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/2.2.0/R2Navigator.podspec'
10+
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/2.2.0/ReadiumOPDS.podspec'
11+
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/2.2.0/ReadiumLCP.podspec'
1212
pod 'R2LCPClient', podspec: 'LCP_URL'
1313

1414
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'

‎Integrations/SPM/project+lcp.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ options:
44
packages:
55
R2Shared:
66
url: https://github.com/readium/r2-shared-swift.git
7-
branch: develop
7+
from: 2.2.0
88
R2Streamer:
99
url: https://github.com/readium/r2-streamer-swift.git
10-
branch: develop
10+
from: 2.2.0
1111
R2Navigator:
1212
url: https://github.com/readium/r2-navigator-swift.git
13-
branch: develop
13+
from: 2.2.0
1414
ReadiumOPDS:
1515
url: https://github.com/readium/r2-opds-swift.git
16-
branch: develop
16+
from: 2.2.0
1717
ReadiumLCP:
1818
url: https://github.com/readium/r2-lcp-swift.git
19-
branch: develop
19+
from: 2.2.0
2020
GRDB:
2121
url: https://github.com/groue/GRDB.swift.git
2222
from: 5.8.0

‎Integrations/SPM/project.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ options:
44
packages:
55
R2Shared:
66
url: https://github.com/readium/r2-shared-swift.git
7-
branch: develop
7+
from: 2.2.0
88
R2Streamer:
99
url: https://github.com/readium/r2-streamer-swift.git
10-
branch: develop
10+
from: 2.2.0
1111
R2Navigator:
1212
url: https://github.com/readium/r2-navigator-swift.git
13-
branch: develop
13+
from: 2.2.0
1414
ReadiumOPDS:
1515
url: https://github.com/readium/r2-opds-swift.git
16-
branch: develop
16+
from: 2.2.0
1717
GRDB:
1818
url: https://github.com/groue/GRDB.swift.git
1919
from: 5.8.0

‎Integrations/Submodules/r2-lcp-swift

‎Integrations/Submodules/r2-navigator-swift

Submodule r2-navigator-swift updated 30 files

‎Integrations/Submodules/r2-opds-swift

‎Integrations/Submodules/r2-shared-swift

‎Integrations/Submodules/r2-streamer-swift

‎Sources/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@
192192
<key>CFBundlePackageType</key>
193193
<string>APPL</string>
194194
<key>CFBundleShortVersionString</key>
195-
<string>2.2.1</string>
195+
<string>2.2.2</string>
196196
<key>CFBundleVersion</key>
197-
<string>2.2.1</string>
197+
<string>2.2.2</string>
198198
<key>LSRequiresIPhoneOS</key>
199199
<true/>
200200
<key>LSSupportsOpeningDocumentsInPlace</key>

0 commit comments

Comments
 (0)