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

Commit 8759eae

Browse files
mickael-menumickael-menu
authored
Merge pull request #360 from readium/2.2.0-beta.1
2.2.0-beta.1
2 parents 576e598 + 161460c commit 8759eae

File tree

7 files changed

+39
-48
lines changed

7 files changed

+39
-48
lines changed

‎Cartfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ github "cezheng/Fuzi" == 3.1.2
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.1
12+
github "readium/r2-streamer-swift" == 2.0.0-beta.1
13+
github "readium/r2-navigator-swift" == 2.0.0-beta.1
14+
github "readium/readium-opds-swift" == 2.0.0-beta.1

‎Cartfile.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ github "edrlab/GCDWebServer" "3.6.3"
44
github "jdg/MBProgressHUD" "1.2.0"
55
github "krzyzanowskim/CryptoSwift" "1.3.2"
66
github "onevcat/Kingfisher" "5.15.6"
7-
github "readium/r2-navigator-swift" "e13927e04234d166dfea6371d788756cb8eee532"
8-
github "readium/r2-shared-swift" "4ee1ebc0ff1b17156090c22f757017150f51bfac"
9-
github "readium/r2-streamer-swift" "10dda67a12f574b5d726a879b17e9b26e25d4d20"
10-
github "readium/readium-opds-swift" "b51162d43847f8aa9060dc7ad876affe54b92538"
7+
github "readium/r2-navigator-swift" "2.0.0-beta.1"
8+
github "readium/r2-shared-swift" "2.0.0-beta.1"
9+
github "readium/r2-streamer-swift" "2.0.0-beta.1"
10+
github "readium/readium-opds-swift" "2.0.0-beta.1"
1111
github "scinfu/SwiftSoup" "2.3.2"
1212
github "stephencelis/SQLite.swift" "0.12.2"
1313
github "weichsel/ZIPFoundation" "0.9.11"

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

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -975,17 +975,27 @@
975975
isa = PBXProject;
976976
attributes = {
977977
LastSwiftUpdateCheck = 0830;
978-
LastUpgradeCheck = 1200;
978+
LastUpgradeCheck = 1230;
979979
ORGANIZATIONNAME = Readium;
980980
TargetAttributes = {
981+
0350FCE3211CD2CB006994C2 = {
982+
DevelopmentTeam = 327YA3JNGT;
983+
ProvisioningStyle = Automatic;
984+
};
985+
0350FD37211CD625006994C2 = {
986+
DevelopmentTeam = 327YA3JNGT;
987+
ProvisioningStyle = Automatic;
988+
};
981989
CA822C71221C5737005800D1 = {
982990
DevelopmentTeam = 327YA3JNGT;
983991
LastSwiftMigration = 1010;
984992
ProvisioningStyle = Automatic;
985993
};
986994
F3E7D4371F4EF6D400DF166D = {
987995
CreatedOnToolsVersion = 8.3.3;
996+
DevelopmentTeam = 327YA3JNGT;
988997
LastSwiftMigration = 0930;
998+
ProvisioningStyle = Automatic;
989999
SystemCapabilities = {
9901000
com.apple.iCloud = {
9911001
enabled = 1;
@@ -1469,7 +1479,7 @@
14691479
CODE_SIGN_IDENTITY = "Apple Development";
14701480
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14711481
CODE_SIGN_STYLE = Automatic;
1472-
CURRENT_PROJECT_VERSION = 16;
1482+
CURRENT_PROJECT_VERSION = 17;
14731483
DEVELOPMENT_TEAM = 327YA3JNGT;
14741484
FRAMEWORK_SEARCH_PATHS = (
14751485
"$(inherited)",
@@ -1479,10 +1489,7 @@
14791489
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
14801490
INFOPLIST_FILE = "r2-testapp-swift/r2-testapp-swift-Info.plist";
14811491
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1482-
LD_RUNPATH_SEARCH_PATHS = (
1483-
"$(inherited)",
1484-
"@executable_path/Frameworks",
1485-
);
1492+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
14861493
LIBRARY_SEARCH_PATHS = (
14871494
"$(inherited)",
14881495
"$(PROJECT_DIR)",
@@ -1508,7 +1515,7 @@
15081515
CODE_SIGN_IDENTITY = "Apple Development";
15091516
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15101517
CODE_SIGN_STYLE = Automatic;
1511-
CURRENT_PROJECT_VERSION = 16;
1518+
CURRENT_PROJECT_VERSION = 17;
15121519
DEVELOPMENT_TEAM = 327YA3JNGT;
15131520
FRAMEWORK_SEARCH_PATHS = (
15141521
"$(inherited)",
@@ -1518,10 +1525,7 @@
15181525
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
15191526
INFOPLIST_FILE = "r2-testapp-swift/r2-testapp-swift-Info.plist";
15201527
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1521-
LD_RUNPATH_SEARCH_PATHS = (
1522-
"$(inherited)",
1523-
"@executable_path/Frameworks",
1524-
);
1528+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
15251529
LIBRARY_SEARCH_PATHS = (
15261530
"$(inherited)",
15271531
"$(PROJECT_DIR)",
@@ -1547,7 +1551,7 @@
15471551
CODE_SIGN_IDENTITY = "Apple Development";
15481552
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15491553
CODE_SIGN_STYLE = Automatic;
1550-
CURRENT_PROJECT_VERSION = 16;
1554+
CURRENT_PROJECT_VERSION = 17;
15511555
DEVELOPMENT_TEAM = 327YA3JNGT;
15521556
FRAMEWORK_SEARCH_PATHS = (
15531557
"$(inherited)",
@@ -1557,10 +1561,7 @@
15571561
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
15581562
INFOPLIST_FILE = "r2-testapp-swift/r2-testapp-swift-Info.plist";
15591563
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1560-
LD_RUNPATH_SEARCH_PATHS = (
1561-
"$(inherited)",
1562-
"@executable_path/Frameworks",
1563-
);
1564+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
15641565
LIBRARY_SEARCH_PATHS = (
15651566
"$(inherited)",
15661567
"$(PROJECT_DIR)",
@@ -1586,7 +1587,7 @@
15861587
CODE_SIGN_IDENTITY = "Apple Development";
15871588
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15881589
CODE_SIGN_STYLE = Automatic;
1589-
CURRENT_PROJECT_VERSION = 16;
1590+
CURRENT_PROJECT_VERSION = 17;
15901591
DEVELOPMENT_TEAM = 327YA3JNGT;
15911592
FRAMEWORK_SEARCH_PATHS = (
15921593
"$(inherited)",
@@ -1596,10 +1597,7 @@
15961597
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
15971598
INFOPLIST_FILE = "r2-testapp-swift/r2-testapp-swift-Info.plist";
15981599
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1599-
LD_RUNPATH_SEARCH_PATHS = (
1600-
"$(inherited)",
1601-
"@executable_path/Frameworks",
1602-
);
1600+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
16031601
LIBRARY_SEARCH_PATHS = (
16041602
"$(inherited)",
16051603
"$(PROJECT_DIR)",
@@ -1624,7 +1622,7 @@
16241622
CODE_SIGN_ENTITLEMENTS = "r2-testapp-swift/r2-testapp-swift.entitlements";
16251623
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16261624
CODE_SIGN_STYLE = Automatic;
1627-
CURRENT_PROJECT_VERSION = 16;
1625+
CURRENT_PROJECT_VERSION = 17;
16281626
DEVELOPMENT_TEAM = 327YA3JNGT;
16291627
FRAMEWORK_SEARCH_PATHS = (
16301628
"$(inherited)",
@@ -1634,10 +1632,7 @@
16341632
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
16351633
INFOPLIST_FILE = "r2-testapp-swift/r2-testapp-swift-Info.plist";
16361634
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1637-
LD_RUNPATH_SEARCH_PATHS = (
1638-
"$(inherited)",
1639-
"@executable_path/Frameworks",
1640-
);
1635+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
16411636
LIBRARY_SEARCH_PATHS = (
16421637
"$(inherited)",
16431638
"$(PROJECT_DIR)",
@@ -1661,7 +1656,7 @@
16611656
CODE_SIGN_ENTITLEMENTS = "r2-testapp-swift/r2-testapp-swift.entitlements";
16621657
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16631658
CODE_SIGN_STYLE = Automatic;
1664-
CURRENT_PROJECT_VERSION = 16;
1659+
CURRENT_PROJECT_VERSION = 17;
16651660
DEVELOPMENT_TEAM = 327YA3JNGT;
16661661
FRAMEWORK_SEARCH_PATHS = (
16671662
"$(inherited)",
@@ -1671,10 +1666,7 @@
16711666
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
16721667
INFOPLIST_FILE = "r2-testapp-swift/r2-testapp-swift-Info.plist";
16731668
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1674-
LD_RUNPATH_SEARCH_PATHS = (
1675-
"$(inherited)",
1676-
"@executable_path/Frameworks",
1677-
);
1669+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
16781670
LIBRARY_SEARCH_PATHS = (
16791671
"$(inherited)",
16801672
"$(PROJECT_DIR)",
@@ -1802,8 +1794,7 @@
18021794
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
18031795
MTL_ENABLE_DEBUG_INFO = NO;
18041796
SDKROOT = iphoneos;
1805-
SWIFT_COMPILATION_MODE = wholemodule;
1806-
SWIFT_OPTIMIZATION_LEVEL = "-O";
1797+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
18071798
SWIFT_VERSION = 5.0;
18081799
TARGETED_DEVICE_FAMILY = "1,2";
18091800
VALIDATE_PRODUCT = YES;
@@ -1819,7 +1810,7 @@
18191810
CODE_SIGN_IDENTITY = "Apple Development";
18201811
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18211812
CODE_SIGN_STYLE = Automatic;
1822-
CURRENT_PROJECT_VERSION = 16;
1813+
CURRENT_PROJECT_VERSION = 17;
18231814
DEVELOPMENT_TEAM = 327YA3JNGT;
18241815
FRAMEWORK_SEARCH_PATHS = (
18251816
"$(inherited)",
@@ -1855,7 +1846,7 @@
18551846
CODE_SIGN_IDENTITY = "Apple Development";
18561847
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
18571848
CODE_SIGN_STYLE = Automatic;
1858-
CURRENT_PROJECT_VERSION = 16;
1849+
CURRENT_PROJECT_VERSION = 17;
18591850
DEVELOPMENT_TEAM = 327YA3JNGT;
18601851
FRAMEWORK_SEARCH_PATHS = (
18611852
"$(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 = "1200"
3+
LastUpgradeVersion = "1230"
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 = "1200"
3+
LastUpgradeVersion = "1230"
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 = "1200"
3+
LastUpgradeVersion = "1230"
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 = "1200"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)