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

Commit

Permalink
Upgrade to Readium 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mickael-menu
mickael-menu committed Nov 1, 2021
1 parent d44e834 commit ac8921d
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions Integrations/Carthage/Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Readium 2 dependencies
github "readium/r2-shared-swift" "develop"
github "readium/r2-streamer-swift" "develop"
github "readium/r2-navigator-swift" "develop"
github "readium/r2-opds-swift" "develop"
github "readium/r2-shared-swift" "2.2.0"
github "readium/r2-streamer-swift" "2.2.0"
github "readium/r2-navigator-swift" "2.2.0"
github "readium/r2-opds-swift" "2.2.0"
10 changes: 5 additions & 5 deletions Integrations/Carthage/Cartfile+lcp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Readium 2 dependencies
github "readium/r2-shared-swift" "develop"
github "readium/r2-streamer-swift" "develop"
github "readium/r2-navigator-swift" "develop"
github "readium/r2-opds-swift" "develop"
github "readium/r2-lcp-swift" "develop"
github "readium/r2-shared-swift" "2.2.0"
github "readium/r2-streamer-swift" "2.2.0"
github "readium/r2-navigator-swift" "2.2.0"
github "readium/r2-opds-swift" "2.2.0"
github "readium/r2-lcp-swift" "2.2.0"
10 changes: 5 additions & 5 deletions Integrations/CocoaPods/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ target 'R2TestApp' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/develop/R2Shared.podspec'
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/develop/R2Streamer.podspec'
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/develop/R2Navigator.podspec'
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/develop/ReadiumOPDS.podspec'
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/develop/ReadiumLCP.podspec'
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/2.2.0/R2Shared.podspec'
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/2.2.0/R2Streamer.podspec'
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/2.2.0/R2Navigator.podspec'
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/2.2.0/ReadiumOPDS.podspec'
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/2.2.0/ReadiumLCP.podspec'

pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
pod 'GRDB.swift'
Expand Down
10 changes: 5 additions & 5 deletions Integrations/CocoaPods/Podfile+lcp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ target 'R2TestApp' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/develop/R2Shared.podspec'
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/develop/R2Streamer.podspec'
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/develop/R2Navigator.podspec'
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/develop/ReadiumOPDS.podspec'
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/develop/ReadiumLCP.podspec'
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/r2-shared-swift/2.2.0/R2Shared.podspec'
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/r2-streamer-swift/2.2.0/R2Streamer.podspec'
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/r2-navigator-swift/2.2.0/R2Navigator.podspec'
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/r2-opds-swift/2.2.0/ReadiumOPDS.podspec'
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/2.2.0/ReadiumLCP.podspec'
pod 'R2LCPClient', podspec: 'LCP_URL'

pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
Expand Down
10 changes: 5 additions & 5 deletions Integrations/SPM/project+lcp.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ options:
packages:
R2Shared:
url: https://github.com/readium/r2-shared-swift.git
branch: develop
from: 2.2.0
R2Streamer:
url: https://github.com/readium/r2-streamer-swift.git
branch: develop
branch: 2.2.0
R2Navigator:
url: https://github.com/readium/r2-navigator-swift.git
branch: develop
branch: 2.2.0
ReadiumOPDS:
url: https://github.com/readium/r2-opds-swift.git
branch: develop
branch: 2.2.0
ReadiumLCP:
url: https://github.com/readium/r2-lcp-swift.git
branch: develop
branch: 2.2.0
GRDB:
url: https://github.com/groue/GRDB.swift.git
from: 5.8.0
Expand Down
8 changes: 4 additions & 4 deletions Integrations/SPM/project.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ options:
packages:
R2Shared:
url: https://github.com/readium/r2-shared-swift.git
branch: develop
from: 2.2.0
R2Streamer:
url: https://github.com/readium/r2-streamer-swift.git
branch: develop
branch: 2.2.0
R2Navigator:
url: https://github.com/readium/r2-navigator-swift.git
branch: develop
branch: 2.2.0
ReadiumOPDS:
url: https://github.com/readium/r2-opds-swift.git
branch: develop
branch: 2.2.0
GRDB:
url: https://github.com/groue/GRDB.swift.git
from: 5.8.0
Expand Down
2 changes: 1 addition & 1 deletion Integrations/Submodules/r2-lcp-swift
Submodule r2-lcp-swift updated 7 files
+7 −3 .github/workflows/build.yml
+8 −0 CHANGELOG.md
+1 −1 Cartfile
+3 −3 Cartfile.resolved
+9 −9 Package.resolved
+1 −1 Package.swift
+6 −3 ReadiumLCP.podspec
2 changes: 1 addition & 1 deletion Integrations/Submodules/r2-navigator-swift
Submodule r2-navigator-swift updated 30 files
+1 −2 .github/workflows/build.yml
+2 −2 .github/workflows/lint.yml
+12 −0 CHANGELOG.md
+1 −1 Cartfile
+2 −2 Cartfile.resolved
+4 −0 Makefile
+14 −5 Package.resolved
+5 −2 Package.swift
+2 −2 R2Navigator.podspec
+1 −0 project-carthage-as-submodules.yml
+1 −0 project-carthage.yml
+4 −0 r2-navigator-swift.xcodeproj/project.pbxproj
+151 −1 r2-navigator-swift/EPUB/Assets/Static/scripts/readium-fixed-wrapper.js
+1 −1 r2-navigator-swift/EPUB/Assets/Static/scripts/readium-fixed-wrapper.js.map
+8,097 −1 r2-navigator-swift/EPUB/Assets/Static/scripts/readium-fixed.js
+1 −1 r2-navigator-swift/EPUB/Assets/Static/scripts/readium-fixed.js.map
+8,129 −1 r2-navigator-swift/EPUB/Assets/Static/scripts/readium-reflowable.js
+1 −1 r2-navigator-swift/EPUB/Assets/Static/scripts/readium-reflowable.js.map
+10 −0 r2-navigator-swift/EPUB/EPUBFixedSpreadView.swift
+6 −0 r2-navigator-swift/EPUB/EPUBReflowableSpreadView.swift
+7 −2 r2-navigator-swift/EPUB/EPUBSpreadView.swift
+0 −4,196 r2-navigator-swift/EPUB/Scripts/package-lock.json
+3 −1 r2-navigator-swift/EPUB/Scripts/package.json
+4 −0 r2-navigator-swift/EPUB/Scripts/src/decorator.js
+4 −1 r2-navigator-swift/EPUB/Scripts/src/rect.js
+8 −1 r2-navigator-swift/EPUB/Scripts/src/selection.js
+41 −0 r2-navigator-swift/EPUB/Scripts/src/utils.js
+2 −2 r2-navigator-swift/EPUB/Scripts/webpack.config.js
+1,736 −0 r2-navigator-swift/EPUB/Scripts/yarn.lock
+4 −1 r2-navigator-swift/EditingAction.swift
2 changes: 1 addition & 1 deletion Integrations/Submodules/r2-opds-swift
Submodule r2-opds-swift updated 5 files
+1 −1 Cartfile
+2 −2 Cartfile.resolved
+5 −5 Package.resolved
+1 −1 Package.swift
+2 −2 ReadiumOPDS.podspec
2 changes: 1 addition & 1 deletion Integrations/Submodules/r2-shared-swift
Submodule r2-shared-swift updated 7 files
+1 −2 .github/workflows/build.yml
+9 −1 CHANGELOG.md
+1 −1 Cartfile.resolved
+2 −2 Package.resolved
+2 −2 R2Shared.podspec
+32 −4 r2-shared-swift/Fetcher/Resource/ResourceContentExtractor.swift
+1 −0 r2-shared-swift/Toolkit/XML/Fuzi.swift
2 changes: 1 addition & 1 deletion Integrations/Submodules/r2-streamer-swift
Submodule r2-streamer-swift updated 7 files
+1 −2 .github/workflows/build.yml
+1 −1 Cartfile
+3 −3 Cartfile.resolved
+7 −7 Package.resolved
+1 −1 Package.swift
+2 −2 R2Streamer.podspec
+6 −15 r2-streamer-swift/Parser/EPUB/Resource Transformers/EPUBHTMLInjector.swift
4 changes: 2 additions & 2 deletions Sources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.2.1</string>
<string>2.2.2</string>
<key>CFBundleVersion</key>
<string>2.2.1</string>
<string>2.2.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
Expand Down

0 comments on commit ac8921d

Please sign in to comment.