Skip to content

Commit beea99b

Browse files
author
Millie Savalia
committed
upgraded Readium
1 parent 229e326 commit beea99b

File tree

8 files changed

+26
-24
lines changed

8 files changed

+26
-24
lines changed

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

‎Simplified.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@
512512
7392E4622788E75B006F010E /* NYPLCardCreator in Frameworks */ = {isa = PBXBuildFile; productRef = 7392E4612788E75B006F010E /* NYPLCardCreator */; };
513513
7392E4682788E7CB006F010E /* NYPLAudiobookToolkit in Frameworks */ = {isa = PBXBuildFile; productRef = 7392E4672788E7CB006F010E /* NYPLAudiobookToolkit */; };
514514
7392E46A2788E7CB006F010E /* NYPLCardCreator in Frameworks */ = {isa = PBXBuildFile; productRef = 7392E4692788E7CB006F010E /* NYPLCardCreator */; };
515-
7392E46C2788E7D8006F010E /* NYPLAxis in Frameworks */ = {isa = PBXBuildFile; productRef = 7392E46B2788E7D8006F010E /* NYPLAxis */; };
516515
7398290E284AC94500382FE1 /* NYPLConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7398290D284AC94500382FE1 /* NYPLConfiguration.swift */; };
517516
73982910284AC94500382FE1 /* NYPLConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7398290D284AC94500382FE1 /* NYPLConfiguration.swift */; };
518517
73982911284AC94500382FE1 /* NYPLConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7398290D284AC94500382FE1 /* NYPLConfiguration.swift */; };
@@ -1864,7 +1863,6 @@
18641863
73FCA37225005BA4001B0C5D /* libz.dylib in Frameworks */,
18651864
73FCA36A25005BA4001B0C5D /* LocalAuthentication.framework in Frameworks */,
18661865
73FCA35D25005BA4001B0C5D /* MediaPlayer.framework in Frameworks */,
1867-
7392E46C2788E7D8006F010E /* NYPLAxis in Frameworks */,
18681866
73369F1E27862D6800752ECB /* PureLayout in Frameworks */,
18691867
73F5DE882774EE3200597F1E /* NYPLUtilities in Frameworks */,
18701868
732F04712633783B0018A82E /* PDFRendererProvider.xcframework in Frameworks */,
@@ -3233,7 +3231,6 @@
32333231
packageProductDependencies = (
32343232
73F5DE872774EE3200597F1E /* NYPLUtilities */,
32353233
73369F1D27862D6800752ECB /* PureLayout */,
3236-
7392E46B2788E7D8006F010E /* NYPLAxis */,
32373234
);
32383235
productName = Simplified;
32393236
productReference = 73FCA3A425005BA4001B0C5D /* Open eBooks.app */;
@@ -3279,9 +3276,10 @@
32793276
A823D805192BABA400B55DE2 /* Project object */ = {
32803277
isa = PBXProject;
32813278
attributes = {
3279+
BuildIndependentTargetsInParallel = YES;
32823280
CLASSPREFIX = NYPL;
32833281
LastSwiftUpdateCheck = 1330;
3284-
LastUpgradeCheck = 1340;
3282+
LastUpgradeCheck = 1610;
32853283
ORGANIZATIONNAME = NYPL;
32863284
TargetAttributes = {
32873285
2D2B47711D08F807007F7764 = {
@@ -4911,6 +4909,7 @@
49114909
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
49124910
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
49134911
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
4912+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
49144913
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
49154914
CLANG_WARN_STRICT_PROTOTYPES = YES;
49164915
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -4919,8 +4918,10 @@
49194918
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
49204919
COPY_PHASE_STRIP = NO;
49214920
DEFINES_MODULE = YES;
4921+
ENABLE_MODULE_VERIFIER = YES;
49224922
ENABLE_STRICT_OBJC_MSGSEND = YES;
49234923
ENABLE_TESTABILITY = YES;
4924+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
49244925
GCC_C_LANGUAGE_STANDARD = c99;
49254926
GCC_DYNAMIC_NO_PIC = NO;
49264927
GCC_NO_COMMON_BLOCKS = YES;
@@ -4937,6 +4938,7 @@
49374938
GCC_WARN_UNUSED_FUNCTION = YES;
49384939
GCC_WARN_UNUSED_VARIABLE = YES;
49394940
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
4941+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "c99 gnu++11";
49404942
ONLY_ACTIVE_ARCH = YES;
49414943
OTHER_LDFLAGS = (
49424944
"$(inherited)",
@@ -4973,6 +4975,7 @@
49734975
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
49744976
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
49754977
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
4978+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
49764979
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
49774980
CLANG_WARN_STRICT_PROTOTYPES = YES;
49784981
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -4981,8 +4984,10 @@
49814984
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
49824985
COPY_PHASE_STRIP = YES;
49834986
DEFINES_MODULE = YES;
4987+
ENABLE_MODULE_VERIFIER = YES;
49844988
ENABLE_NS_ASSERTIONS = NO;
49854989
ENABLE_STRICT_OBJC_MSGSEND = YES;
4990+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
49864991
GCC_C_LANGUAGE_STANDARD = c99;
49874992
GCC_NO_COMMON_BLOCKS = YES;
49884993
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -4992,6 +4997,7 @@
49924997
GCC_WARN_UNUSED_FUNCTION = YES;
49934998
GCC_WARN_UNUSED_VARIABLE = YES;
49944999
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
5000+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "c99 gnu++11";
49955001
OTHER_LDFLAGS = (
49965002
"$(inherited)",
49975003
"-ObjC",
@@ -5185,7 +5191,7 @@
51855191
repositoryURL = "https://github.com/readium/swift-toolkit.git";
51865192
requirement = {
51875193
kind = upToNextMinorVersion;
5188-
minimumVersion = 2.6.1;
5194+
minimumVersion = 2.7.4;
51895195
};
51905196
};
51915197
73579044276BE7F2009F1ADF /* XCRemoteSwiftPackageReference "iOS-Utilities" */ = {
@@ -5321,10 +5327,6 @@
53215327
isa = XCSwiftPackageProductDependency;
53225328
productName = NYPLCardCreator;
53235329
};
5324-
7392E46B2788E7D8006F010E /* NYPLAxis */ = {
5325-
isa = XCSwiftPackageProductDependency;
5326-
productName = NYPLAxis;
5327-
};
53285330
739F43A52770FEA5005A8E1F /* NYPLUtilities */ = {
53295331
isa = XCSwiftPackageProductDependency;
53305332
package = 73579044276BE7F2009F1ADF /* XCRemoteSwiftPackageReference "iOS-Utilities" */;

‎Simplified.xcodeproj/xcshareddata/xcschemes/Open eBooks.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 = "1500"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE-R2dev.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 = "1500"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE-noDRM.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 = "1500"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE.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 = "1500"
3+
LastUpgradeVersion = "1610"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Simplified/Network/NYPLNetworkQueue.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ final class NetworkQueue: NSObject {
5252

5353
private let sqlTable = Table(NetworkQueue.TableName)
5454

55-
private let sqlID = Expression<Int>("id")
56-
private let sqlLibraryID = Expression<String>("library_identifier")
57-
private let sqlUpdateID = Expression<String?>("update_identifier")
58-
private let sqlUrl = Expression<String>("request_url")
59-
private let sqlMethod = Expression<String>("request_method")
60-
private let sqlParameters = Expression<Data?>("request_parameters")
61-
private let sqlHeader = Expression<Data?>("request_header")
62-
private let sqlRetries = Expression<Int>("retry_count")
63-
private let sqlDateCreated = Expression<Data>("date_created")
55+
private let sqlID = Expression<Int>(value: "id")
56+
private let sqlLibraryID = Expression<String>(value: "library_identifier")
57+
private let sqlUpdateID = Expression<String?>(value: "update_identifier")
58+
private let sqlUrl = Expression<String>(value: "request_url")
59+
private let sqlMethod = Expression<String>(value: "request_method")
60+
private let sqlParameters = Expression<Data?>(value: "request_parameters")
61+
private let sqlHeader = Expression<Data?>(value: "request_header")
62+
private let sqlRetries = Expression<Int>(value: "retry_count")
63+
private let sqlDateCreated = Expression<Data>(value: "date_created")
6464

6565

6666
// MARK: - Public Functions

‎Simplified/Reader2/Bookmarks/NYPLReadiumBookmark.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import NYPLUtilities
8686
let progressWithinBook: Float?
8787

8888
var percentInChapter:String {
89-
return (self.progressWithinChapter * 100).roundTo(decimalPlaces: 0)
89+
return (Double(self.progressWithinChapter * 100)).roundTo(decimalPlaces: 0)
9090
}
9191

9292
/// The device ID this bookmark was created on.

0 commit comments

Comments
 (0)