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

Commit eb1d70b

Browse files
mickael-menumickael-menu
authored
2.2.0 (#387)
1 parent 29bb3a3 commit eb1d70b

14 files changed

+28
-30
lines changed

‎Cartfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github "cezheng/Fuzi" == 3.1.3
88
github "dexman/Minizip" == 1.4.0
99
github "scinfu/SwiftSoup" == 2.3.2
1010

11-
github "readium/r2-shared-swift" "develop"
12-
github "readium/r2-streamer-swift" "develop"
13-
github "readium/r2-navigator-swift" "develop"
14-
github "readium/r2-opds-swift" "develop"
15-
github "readium/r2-lcp-swift" "develop"
11+
github "readium/r2-shared-swift" == 2.0.0
12+
github "readium/r2-streamer-swift" == 2.0.0
13+
github "readium/r2-navigator-swift" == 2.0.0
14+
github "readium/r2-opds-swift" == 2.0.0
15+
github "readium/r2-lcp-swift" == 2.0.0

‎Cartfile.resolved

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ github "edrlab/GCDWebServer" "3.6.3"
44
github "jdg/MBProgressHUD" "1.2.0"
55
github "krzyzanowskim/CryptoSwift" "1.3.8"
66
github "onevcat/Kingfisher" "5.15.8"
7-
github "readium/r2-lcp-swift" "7f68db4db071f0680da419fe908b89a0c5770a78"
8-
github "readium/r2-navigator-swift" "8bf969bc5ca8f204cb76f0cf32d61cc0ecf73723"
9-
github "readium/r2-opds-swift" "615458261b1786bc858b94772c29f55c97e44b68"
10-
github "readium/r2-shared-swift" "d8b571d2ad66b2f7b7c44278e1269332b69559ab"
11-
github "readium/r2-streamer-swift" "a781b5430b926370ee81de8a6c177a06d48d0f17"
7+
github "readium/r2-lcp-swift" "2.0.0"
8+
github "readium/r2-navigator-swift" "2.0.0"
9+
github "readium/r2-opds-swift" "2.0.0"
10+
github "readium/r2-shared-swift" "2.0.0"
11+
github "readium/r2-streamer-swift" "2.0.0"
1212
github "scinfu/SwiftSoup" "2.3.2"
1313
github "stephencelis/SQLite.swift" "0.12.2"
1414
github "weichsel/ZIPFoundation" "0.9.11"

‎r2-testapp-swift.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@
11411141
isa = PBXProject;
11421142
attributes = {
11431143
LastSwiftUpdateCheck = 0830;
1144-
LastUpgradeCheck = 1240;
1144+
LastUpgradeCheck = 1250;
11451145
ORGANIZATIONNAME = Readium;
11461146
TargetAttributes = {
11471147
0350FCE3211CD2CB006994C2 = {
@@ -1668,7 +1668,7 @@
16681668
CODE_SIGN_IDENTITY = "Apple Development";
16691669
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16701670
CODE_SIGN_STYLE = Automatic;
1671-
CURRENT_PROJECT_VERSION = 18;
1671+
CURRENT_PROJECT_VERSION = 19;
16721672
DEVELOPMENT_TEAM = 327YA3JNGT;
16731673
FRAMEWORK_SEARCH_PATHS = (
16741674
"$(inherited)",
@@ -1706,7 +1706,7 @@
17061706
CODE_SIGN_IDENTITY = "Apple Development";
17071707
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17081708
CODE_SIGN_STYLE = Automatic;
1709-
CURRENT_PROJECT_VERSION = 18;
1709+
CURRENT_PROJECT_VERSION = 19;
17101710
DEVELOPMENT_TEAM = 327YA3JNGT;
17111711
FRAMEWORK_SEARCH_PATHS = (
17121712
"$(inherited)",
@@ -1744,7 +1744,7 @@
17441744
CODE_SIGN_IDENTITY = "Apple Development";
17451745
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17461746
CODE_SIGN_STYLE = Automatic;
1747-
CURRENT_PROJECT_VERSION = 18;
1747+
CURRENT_PROJECT_VERSION = 19;
17481748
DEVELOPMENT_TEAM = 327YA3JNGT;
17491749
FRAMEWORK_SEARCH_PATHS = (
17501750
"$(inherited)",
@@ -1782,7 +1782,7 @@
17821782
CODE_SIGN_IDENTITY = "Apple Development";
17831783
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17841784
CODE_SIGN_STYLE = Automatic;
1785-
CURRENT_PROJECT_VERSION = 18;
1785+
CURRENT_PROJECT_VERSION = 19;
17861786
DEVELOPMENT_TEAM = 327YA3JNGT;
17871787
FRAMEWORK_SEARCH_PATHS = (
17881788
"$(inherited)",
@@ -1819,7 +1819,7 @@
18191819
CODE_SIGN_ENTITLEMENTS = "r2-testapp-swift/r2-testapp-swift.entitlements";
18201820
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18211821
CODE_SIGN_STYLE = Automatic;
1822-
CURRENT_PROJECT_VERSION = 18;
1822+
CURRENT_PROJECT_VERSION = 19;
18231823
DEVELOPMENT_TEAM = 327YA3JNGT;
18241824
FRAMEWORK_SEARCH_PATHS = (
18251825
"$(inherited)",
@@ -1855,7 +1855,7 @@
18551855
CODE_SIGN_ENTITLEMENTS = "r2-testapp-swift/r2-testapp-swift.entitlements";
18561856
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18571857
CODE_SIGN_STYLE = Automatic;
1858-
CURRENT_PROJECT_VERSION = 18;
1858+
CURRENT_PROJECT_VERSION = 19;
18591859
DEVELOPMENT_TEAM = 327YA3JNGT;
18601860
FRAMEWORK_SEARCH_PATHS = (
18611861
"$(inherited)",
@@ -2012,7 +2012,7 @@
20122012
CODE_SIGN_IDENTITY = "Apple Development";
20132013
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
20142014
CODE_SIGN_STYLE = Automatic;
2015-
CURRENT_PROJECT_VERSION = 18;
2015+
CURRENT_PROJECT_VERSION = 19;
20162016
DEVELOPMENT_TEAM = 327YA3JNGT;
20172017
FRAMEWORK_SEARCH_PATHS = (
20182018
"$(inherited)",
@@ -2050,7 +2050,7 @@
20502050
CODE_SIGN_IDENTITY = "Apple Development";
20512051
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
20522052
CODE_SIGN_STYLE = Automatic;
2053-
CURRENT_PROJECT_VERSION = 18;
2053+
CURRENT_PROJECT_VERSION = 19;
20542054
DEVELOPMENT_TEAM = 327YA3JNGT;
20552055
FRAMEWORK_SEARCH_PATHS = (
20562056
"$(inherited)",

‎r2-testapp-swift.xcodeproj/xcshareddata/xcschemes/r2-testapp-swift (carthage).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 = "1240"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎r2-testapp-swift.xcodeproj/xcshareddata/xcschemes/r2-testapp-swift (carthage-with-lcp).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 = "1240"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎r2-testapp-swift.xcodeproj/xcshareddata/xcschemes/r2-testapp-swift (submodules).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 = "1240"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎r2-testapp-swift.xcodeproj/xcshareddata/xcschemes/r2-testapp-swift (submodules-with-lcp).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 = "1240"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎r2-testapp-swift/Library/DRM/DRMLibraryService.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import R2Shared
1515

1616
struct DRMFulfilledPublication {
1717
let localURL: URL
18-
let downloadTask: URLSessionDownloadTask?
1918
let suggestedFilename: String
2019
}
2120

‎r2-testapp-swift/Library/DRM/LCPLibraryService.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class LCPLibraryService: DRMLibraryService {
3535
.map {
3636
DRMFulfilledPublication(
3737
localURL: $0.localURL,
38-
downloadTask: $0.downloadTask,
3938
suggestedFilename: $0.suggestedFilename
4039
)
4140
}

‎r2-testapp-swift/Library/PublicationMenuViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import UIKit
1515

16-
protocol PublicationMenuViewControllerDelegate: class {
16+
protocol PublicationMenuViewControllerDelegate: AnyObject {
1717
func infosButtonTapped()
1818
func removeButtonTapped()
1919
func cancelButtonTapped()

‎r2-testapp-swift/Reader/EPUB/User Settings/AdvancedSettingsViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import UIKit
1414
import R2Navigator
1515
import R2Shared
1616

17-
protocol AdvancedSettingsDelegate: class {
17+
protocol AdvancedSettingsDelegate: AnyObject {
1818

1919
func publisherSettingsDidChange()
2020

‎r2-testapp-swift/Reader/EPUB/User Settings/FontSelectionViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import UIKit
1414
import R2Navigator
1515
import R2Shared
1616

17-
protocol FontSelectionDelegate: class {
17+
protocol FontSelectionDelegate: AnyObject {
1818
func currentFontIndex() -> Int
1919
func fontDidChange(to fontIndex: Int)
2020
}

‎r2-testapp-swift/Reader/EPUB/User Settings/UserSettingsNavigationController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import UIKit
1414
import R2Navigator
1515
import R2Shared
1616

17-
protocol UserSettingsNavigationControllerDelegate: class {
17+
protocol UserSettingsNavigationControllerDelegate: AnyObject {
1818
func getUserSettings() -> UserSettings
1919
func updateUserSettingsStyle()
2020
func setUIColor(for appearance: UserProperty)

‎r2-testapp-swift/Reader/EPUB/User Settings/UserSettingsTableViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import UIKit
1515
import R2Navigator
1616
import R2Shared
1717

18-
protocol UserSettingsDelegate: class {
18+
protocol UserSettingsDelegate: AnyObject {
1919
func fontSizeDidChange(increase: Bool)
2020
func appearanceDidChange(to appearanceIndex: Int)
2121
func scrollModeDidChange()

0 commit comments

Comments
 (0)