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

Commit 7bceadb

Browse files
mickael-menumickael-menu
authored
2.2.0-beta.2 (#381)
1 parent 558a85c commit 7bceadb

8 files changed

+30
-27
lines changed

‎Cartfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +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/readium-opds-swift" "develop"
11+
github "readium/r2-shared-swift" == 2.0.0-beta.2
12+
github "readium/r2-streamer-swift" == 2.0.0-beta.2
13+
github "readium/r2-navigator-swift" == 2.0.0-beta.2
14+
github "readium/r2-opds-swift" == 2.0.0-beta.2
15+
github "readium/r2-lcp-swift" == 2.0.0-beta.2

‎Cartfile.resolved

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +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-navigator-swift" "f9c268da74b3ae8f387af3dffbd1589b4641b16e"
8-
github "readium/r2-shared-swift" "f2c5e110d0553e807fcee35dd763ccd5d583f499"
9-
github "readium/r2-streamer-swift" "012149c70d0e7d87cec64bde2ac5037a1d4a1061"
10-
github "readium/readium-opds-swift" "fc42209e930c7c40884c0c90b25dc9e9aaefb95f"
7+
github "readium/r2-lcp-swift" "2.0.0-beta.2"
8+
github "readium/r2-navigator-swift" "2.0.0-beta.2"
9+
github "readium/r2-opds-swift" "2.0.0-beta.2"
10+
github "readium/r2-shared-swift" "2.0.0-beta.2"
11+
github "readium/r2-streamer-swift" "2.0.0-beta.2"
1112
github "scinfu/SwiftSoup" "2.3.2"
1213
github "stephencelis/SQLite.swift" "0.12.2"
1314
github "weichsel/ZIPFoundation" "0.9.11"

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@
258258
CA9A40DA221C069D00531EA1 /* LCPViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9A40D7221C069D00531EA1 /* LCPViewModel.swift */; };
259259
CA9A40DC221C06A300531EA1 /* DRMViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9A40D2221C054B00531EA1 /* DRMViewModel.swift */; };
260260
CA9A40DE221C06A500531EA1 /* DRMViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9A40D2221C054B00531EA1 /* DRMViewModel.swift */; };
261+
CAB35A6D2626F4E7002CD7C5 /* ReadiumLCP.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAB35A6C2626F4E7002CD7C5 /* ReadiumLCP.xcframework */; };
262+
CAB35A6E2626F4E7002CD7C5 /* ReadiumLCP.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CAB35A6C2626F4E7002CD7C5 /* ReadiumLCP.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
261263
CABD697324CD7F7200B4AE17 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = CABD697224CD7F7200B4AE17 /* URL.swift */; };
262264
CABD697424CD7F7200B4AE17 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = CABD697224CD7F7200B4AE17 /* URL.swift */; };
263265
CABD697524CD7F7200B4AE17 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = CABD697224CD7F7200B4AE17 /* URL.swift */; };
@@ -318,8 +320,6 @@
318320
CAF8E86C25D2DD2300827825 /* R2Shared.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CAAAEE5B25D17C4D00939C5C /* R2Shared.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
319321
CAF8E86F25D2DD2400827825 /* R2Streamer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAAAEE5C25D17C4E00939C5C /* R2Streamer.xcframework */; };
320322
CAF8E87025D2DD2400827825 /* R2Streamer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CAAAEE5C25D17C4E00939C5C /* R2Streamer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
321-
CAF8E87125D2DD2500827825 /* ReadiumLCP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAA90E1925D1831E0004651A /* ReadiumLCP.framework */; };
322-
CAF8E87225D2DD2500827825 /* ReadiumLCP.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CAA90E1925D1831E0004651A /* ReadiumLCP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
323323
CAF8E87325D2DD2600827825 /* ReadiumOPDS.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAAAEE5A25D17C4D00939C5C /* ReadiumOPDS.xcframework */; };
324324
CAF8E87425D2DD2600827825 /* ReadiumOPDS.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CAAAEE5A25D17C4D00939C5C /* ReadiumOPDS.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
325325
CAF8E87525D2DD2700827825 /* SQLite.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAAAEE5625D17C4D00939C5C /* SQLite.xcframework */; };
@@ -446,7 +446,7 @@
446446
CAF8E87025D2DD2400827825 /* R2Streamer.xcframework in Embed Frameworks */,
447447
CAF8E85E25D2DD1B00827825 /* Kingfisher.xcframework in Embed Frameworks */,
448448
CAF8E87A25D2DD2800827825 /* SwiftSoup.xcframework in Embed Frameworks */,
449-
CAF8E87225D2DD2500827825 /* ReadiumLCP.framework in Embed Frameworks */,
449+
CAB35A6E2626F4E7002CD7C5 /* ReadiumLCP.xcframework in Embed Frameworks */,
450450
CAF8E87425D2DD2600827825 /* ReadiumOPDS.xcframework in Embed Frameworks */,
451451
CAF8E87625D2DD2700827825 /* SQLite.xcframework in Embed Frameworks */,
452452
);
@@ -608,6 +608,7 @@
608608
CAAAEE5D25D17C4E00939C5C /* CryptoSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CryptoSwift.xcframework; path = Carthage/Build/CryptoSwift.xcframework; sourceTree = "<group>"; };
609609
CAAAEE5E25D17C4E00939C5C /* Fuzi.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Fuzi.xcframework; path = Carthage/Build/Fuzi.xcframework; sourceTree = "<group>"; };
610610
CAAAEE5F25D17C4E00939C5C /* MBProgressHUD.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MBProgressHUD.xcframework; path = Carthage/Build/MBProgressHUD.xcframework; sourceTree = "<group>"; };
611+
CAB35A6C2626F4E7002CD7C5 /* ReadiumLCP.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ReadiumLCP.xcframework; path = Carthage/Build/ReadiumLCP.xcframework; sourceTree = "<group>"; };
611612
CABD697224CD7F7200B4AE17 /* URL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = "<group>"; };
612613
CACE84FC225640A500E19E8B /* Bookmark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bookmark.swift; sourceTree = "<group>"; };
613614
CADD69DC22C3A42600A4CADF /* Publication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Publication.swift; sourceTree = "<group>"; };
@@ -670,6 +671,7 @@
670671
CAF8E85225D2DD1700827825 /* CryptoSwift.xcframework in Frameworks */,
671672
CAF8E85725D2DD1800827825 /* Fuzi.xcframework in Frameworks */,
672673
CAF8E85925D2DD1A00827825 /* GCDWebServer.xcframework in Frameworks */,
674+
CAB35A6D2626F4E7002CD7C5 /* ReadiumLCP.xcframework in Frameworks */,
673675
CAF8E85D25D2DD1B00827825 /* Kingfisher.xcframework in Frameworks */,
674676
CAF8E85F25D2DD1C00827825 /* KingfisherSwiftUI.xcframework in Frameworks */,
675677
CAF8E86525D2DD1F00827825 /* Minizip.xcframework in Frameworks */,
@@ -681,7 +683,6 @@
681683
CAF8E87925D2DD2800827825 /* SwiftSoup.xcframework in Frameworks */,
682684
CAF8E87525D2DD2700827825 /* SQLite.xcframework in Frameworks */,
683685
CAF8E87B25D2DD2900827825 /* ZIPFoundation.xcframework in Frameworks */,
684-
CAF8E87125D2DD2500827825 /* ReadiumLCP.framework in Frameworks */,
685686
03A5DB9D23B785FC00D5FCBD /* R2LCPClient.framework in Frameworks */,
686687
);
687688
runOnlyForDeploymentPostprocessing = 0;
@@ -1008,6 +1009,7 @@
10081009
F3E7D4691F4EFE8700DF166D /* Frameworks */ = {
10091010
isa = PBXGroup;
10101011
children = (
1012+
CAB35A6C2626F4E7002CD7C5 /* ReadiumLCP.xcframework */,
10111013
CAF8E91525D2DEF500827825 /* R2Navigator.framework */,
10121014
CAF8E91225D2DEF100827825 /* R2Streamer.framework */,
10131015
CAF8E90F25D2DEEC00827825 /* R2Shared.framework */,
@@ -1140,7 +1142,7 @@
11401142
isa = PBXProject;
11411143
attributes = {
11421144
LastSwiftUpdateCheck = 0830;
1143-
LastUpgradeCheck = 1230;
1145+
LastUpgradeCheck = 1240;
11441146
ORGANIZATIONNAME = Readium;
11451147
TargetAttributes = {
11461148
0350FCE3211CD2CB006994C2 = {
@@ -1684,7 +1686,7 @@
16841686
CODE_SIGN_IDENTITY = "Apple Development";
16851687
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16861688
CODE_SIGN_STYLE = Automatic;
1687-
CURRENT_PROJECT_VERSION = 17;
1689+
CURRENT_PROJECT_VERSION = 18;
16881690
DEVELOPMENT_TEAM = 327YA3JNGT;
16891691
FRAMEWORK_SEARCH_PATHS = (
16901692
"$(inherited)",
@@ -1722,7 +1724,7 @@
17221724
CODE_SIGN_IDENTITY = "Apple Development";
17231725
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17241726
CODE_SIGN_STYLE = Automatic;
1725-
CURRENT_PROJECT_VERSION = 17;
1727+
CURRENT_PROJECT_VERSION = 18;
17261728
DEVELOPMENT_TEAM = 327YA3JNGT;
17271729
FRAMEWORK_SEARCH_PATHS = (
17281730
"$(inherited)",
@@ -1760,7 +1762,7 @@
17601762
CODE_SIGN_IDENTITY = "Apple Development";
17611763
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17621764
CODE_SIGN_STYLE = Automatic;
1763-
CURRENT_PROJECT_VERSION = 17;
1765+
CURRENT_PROJECT_VERSION = 18;
17641766
DEVELOPMENT_TEAM = 327YA3JNGT;
17651767
FRAMEWORK_SEARCH_PATHS = (
17661768
"$(inherited)",
@@ -1798,7 +1800,7 @@
17981800
CODE_SIGN_IDENTITY = "Apple Development";
17991801
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18001802
CODE_SIGN_STYLE = Automatic;
1801-
CURRENT_PROJECT_VERSION = 17;
1803+
CURRENT_PROJECT_VERSION = 18;
18021804
DEVELOPMENT_TEAM = 327YA3JNGT;
18031805
FRAMEWORK_SEARCH_PATHS = (
18041806
"$(inherited)",
@@ -1835,7 +1837,7 @@
18351837
CODE_SIGN_ENTITLEMENTS = "r2-testapp-swift/r2-testapp-swift.entitlements";
18361838
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18371839
CODE_SIGN_STYLE = Automatic;
1838-
CURRENT_PROJECT_VERSION = 17;
1840+
CURRENT_PROJECT_VERSION = 18;
18391841
DEVELOPMENT_TEAM = 327YA3JNGT;
18401842
FRAMEWORK_SEARCH_PATHS = (
18411843
"$(inherited)",
@@ -1871,7 +1873,7 @@
18711873
CODE_SIGN_ENTITLEMENTS = "r2-testapp-swift/r2-testapp-swift.entitlements";
18721874
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18731875
CODE_SIGN_STYLE = Automatic;
1874-
CURRENT_PROJECT_VERSION = 17;
1876+
CURRENT_PROJECT_VERSION = 18;
18751877
DEVELOPMENT_TEAM = 327YA3JNGT;
18761878
FRAMEWORK_SEARCH_PATHS = (
18771879
"$(inherited)",
@@ -2028,7 +2030,7 @@
20282030
CODE_SIGN_IDENTITY = "Apple Development";
20292031
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
20302032
CODE_SIGN_STYLE = Automatic;
2031-
CURRENT_PROJECT_VERSION = 17;
2033+
CURRENT_PROJECT_VERSION = 18;
20322034
DEVELOPMENT_TEAM = 327YA3JNGT;
20332035
FRAMEWORK_SEARCH_PATHS = (
20342036
"$(inherited)",
@@ -2066,7 +2068,7 @@
20662068
CODE_SIGN_IDENTITY = "Apple Development";
20672069
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
20682070
CODE_SIGN_STYLE = Automatic;
2069-
CURRENT_PROJECT_VERSION = 17;
2071+
CURRENT_PROJECT_VERSION = 18;
20702072
DEVELOPMENT_TEAM = 327YA3JNGT;
20712073
FRAMEWORK_SEARCH_PATHS = (
20722074
"$(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 = "1230"
3+
LastUpgradeVersion = "1240"
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 = "1230"
3+
LastUpgradeVersion = "1240"
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 = "1230"
3+
LastUpgradeVersion = "1240"
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 = "1230"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎r2-testapp-swift/OPDS/OPDSCatalogSelectorViewController.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class OPDSCatalogSelectorViewController: UITableViewController {
5252
func preloadTestFeeds() {
5353
let version = 2
5454
let VERSION_KEY = "OPDS_CATALOG_VERSION"
55-
let R2TestCatalog = ["title": "R2 Reader Test Catalog", "url": "https://d2g.dita.digital/opds/collections/10040"]
5655
let OPDS2Catalog = ["title": "OPDS 2.0 Test Catalog", "url": "https://test.opds.io/2.0/home.json"]
5756
let OTBCatalog = ["title": "Open Textbooks Catalog", "url": "http://open.minitex.org/textbooks"]
5857
let SEBCatalog = ["title": "Standard eBooks Catalog", "url": "https://standardebooks.org/opds/all"]
@@ -62,7 +61,7 @@ class OPDSCatalogSelectorViewController: UITableViewController {
6261
if (catalogData == nil || oldversion < version) {
6362
UserDefaults.standard.set(version, forKey: VERSION_KEY)
6463
catalogData = [
65-
R2TestCatalog, OPDS2Catalog, OTBCatalog, SEBCatalog
64+
OPDS2Catalog, OTBCatalog, SEBCatalog
6665
]
6766
UserDefaults.standard.set(catalogData, forKey: userDefaultsID)
6867
}

0 commit comments

Comments
 (0)