Skip to content

Commit 928e664

Browse files
mythzmythz
committed
Update to latest PromiseKit 6.13
1 parent 984d6f3 commit 928e664

4 files changed

Lines changed: 96 additions & 27 deletions

File tree

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "mxcl/PromiseKit" ~> 6.8.3
1+
github "mxcl/PromiseKit" ~> 6.13

‎Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ServiceStack.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ s.description = <<-DESC
88
generate an native typed Swift API for your ServiceStack Services
99
DESC
1010
s.homepage = "https://github.com/ServiceStack/ServiceStack.Swift"
11-
s.license = 'Copyright (c) 2018 ServiceStack, Inc. All rights reserved.'
11+
s.license = 'Copyright (c) 2020 ServiceStack, Inc. All rights reserved.'
1212
s.author = { "ServiceStack, Inc" => "team@servicestack.com" }
1313
s.source = { :git => "https://github.com/ServiceStack/ServiceStack.Swift.git", :tag => s.version.to_s }
1414

‎ServiceStack.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -556,7 +556,7 @@
556556
};
557557
};
558558
buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "ServiceStack" */;
559-
compatibilityVersion = "Xcode 6.3";
559+
compatibilityVersion = "Xcode 11.4";
560560
developmentRegion = en;
561561
hasScannedForEncodings = 0;
562562
knownRegions = (
@@ -1126,7 +1126,11 @@
11261126
);
11271127
INFOPLIST_FILE = Configs/ServiceStack.plist;
11281128
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1129-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1129+
LD_RUNPATH_SEARCH_PATHS = (
1130+
"$(inherited)",
1131+
"@executable_path/Frameworks",
1132+
"@loader_path/Frameworks",
1133+
);
11301134
ONLY_ACTIVE_ARCH = NO;
11311135
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
11321136
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-iOS";
@@ -1155,13 +1159,18 @@
11551159
);
11561160
INFOPLIST_FILE = Configs/ServiceStack.plist;
11571161
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1158-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1162+
LD_RUNPATH_SEARCH_PATHS = (
1163+
"$(inherited)",
1164+
"@executable_path/Frameworks",
1165+
"@loader_path/Frameworks",
1166+
);
11591167
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
11601168
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-iOS";
11611169
PRODUCT_NAME = ServiceStack;
11621170
PROVISIONING_PROFILE_SPECIFIER = "";
11631171
SKIP_INSTALL = YES;
1164-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1172+
SWIFT_COMPILATION_MODE = wholemodule;
1173+
SWIFT_OPTIMIZATION_LEVEL = "-O";
11651174
};
11661175
name = Release;
11671176
};
@@ -1175,7 +1184,12 @@
11751184
"$(PROJECT_DIR)/Carthage/Build/iOS",
11761185
);
11771186
INFOPLIST_FILE = Configs/ServiceStackTests.plist;
1178-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
1187+
LD_RUNPATH_SEARCH_PATHS = (
1188+
"$(inherited)",
1189+
"@executable_path/Frameworks",
1190+
"@loader_path/Frameworks",
1191+
"$(PROJECT_DIR)/Carthage/Build/iOS",
1192+
);
11791193
PRODUCT_BUNDLE_IDENTIFIER = "com.ServiceStack.ServiceStack-iOS-Tests";
11801194
PRODUCT_NAME = "$(TARGET_NAME)";
11811195
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1192,10 +1206,16 @@
11921206
"$(PROJECT_DIR)/Carthage/Build/iOS",
11931207
);
11941208
INFOPLIST_FILE = Configs/ServiceStackTests.plist;
1195-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
1209+
LD_RUNPATH_SEARCH_PATHS = (
1210+
"$(inherited)",
1211+
"@executable_path/Frameworks",
1212+
"@loader_path/Frameworks",
1213+
"$(PROJECT_DIR)/Carthage/Build/iOS",
1214+
);
11961215
PRODUCT_BUNDLE_IDENTIFIER = "com.ServiceStack.ServiceStack-iOS-Tests";
11971216
PRODUCT_NAME = "$(TARGET_NAME)";
1198-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1217+
SWIFT_COMPILATION_MODE = wholemodule;
1218+
SWIFT_OPTIMIZATION_LEVEL = "-O";
11991219
};
12001220
name = Release;
12011221
};
@@ -1217,7 +1237,11 @@
12171237
);
12181238
INFOPLIST_FILE = Configs/ServiceStack.plist;
12191239
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1220-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1240+
LD_RUNPATH_SEARCH_PATHS = (
1241+
"$(inherited)",
1242+
"@executable_path/Frameworks",
1243+
"@loader_path/Frameworks",
1244+
);
12211245
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
12221246
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-watchOS";
12231247
PRODUCT_NAME = ServiceStack;
@@ -1248,14 +1272,19 @@
12481272
);
12491273
INFOPLIST_FILE = Configs/ServiceStack.plist;
12501274
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1251-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1275+
LD_RUNPATH_SEARCH_PATHS = (
1276+
"$(inherited)",
1277+
"@executable_path/Frameworks",
1278+
"@loader_path/Frameworks",
1279+
);
12521280
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
12531281
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-watchOS";
12541282
PRODUCT_NAME = ServiceStack;
12551283
PROVISIONING_PROFILE_SPECIFIER = "";
12561284
SDKROOT = watchos;
12571285
SKIP_INSTALL = YES;
1258-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1286+
SWIFT_COMPILATION_MODE = wholemodule;
1287+
SWIFT_OPTIMIZATION_LEVEL = "-O";
12591288
TARGETED_DEVICE_FAMILY = 4;
12601289
WATCHOS_DEPLOYMENT_TARGET = 2.0;
12611290
};
@@ -1279,7 +1308,11 @@
12791308
);
12801309
INFOPLIST_FILE = Configs/ServiceStack.plist;
12811310
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1282-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1311+
LD_RUNPATH_SEARCH_PATHS = (
1312+
"$(inherited)",
1313+
"@executable_path/Frameworks",
1314+
"@loader_path/Frameworks",
1315+
);
12831316
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
12841317
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-tvOS";
12851318
PRODUCT_NAME = ServiceStack;
@@ -1310,14 +1343,19 @@
13101343
);
13111344
INFOPLIST_FILE = Configs/ServiceStack.plist;
13121345
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1313-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1346+
LD_RUNPATH_SEARCH_PATHS = (
1347+
"$(inherited)",
1348+
"@executable_path/Frameworks",
1349+
"@loader_path/Frameworks",
1350+
);
13141351
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
13151352
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-tvOS";
13161353
PRODUCT_NAME = ServiceStack;
13171354
PROVISIONING_PROFILE_SPECIFIER = "";
13181355
SDKROOT = appletvos;
13191356
SKIP_INSTALL = YES;
1320-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1357+
SWIFT_COMPILATION_MODE = wholemodule;
1358+
SWIFT_OPTIMIZATION_LEVEL = "-O";
13211359
TARGETED_DEVICE_FAMILY = 3;
13221360
TVOS_DEPLOYMENT_TARGET = 9.0;
13231361
};
@@ -1343,7 +1381,11 @@
13431381
FRAMEWORK_VERSION = A;
13441382
INFOPLIST_FILE = Configs/ServiceStack.plist;
13451383
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1346-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1384+
LD_RUNPATH_SEARCH_PATHS = (
1385+
"$(inherited)",
1386+
"@executable_path/../Frameworks",
1387+
"@loader_path/Frameworks",
1388+
);
13471389
MACOSX_DEPLOYMENT_TARGET = 10.10;
13481390
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
13491391
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-macOS";
@@ -1375,15 +1417,20 @@
13751417
FRAMEWORK_VERSION = A;
13761418
INFOPLIST_FILE = Configs/ServiceStack.plist;
13771419
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1378-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1420+
LD_RUNPATH_SEARCH_PATHS = (
1421+
"$(inherited)",
1422+
"@executable_path/../Frameworks",
1423+
"@loader_path/Frameworks",
1424+
);
13791425
MACOSX_DEPLOYMENT_TARGET = 10.10;
13801426
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
13811427
PRODUCT_BUNDLE_IDENTIFIER = "net.ServiceStack.ServiceStack-macOS";
13821428
PRODUCT_NAME = ServiceStack;
13831429
PROVISIONING_PROFILE_SPECIFIER = "";
13841430
SDKROOT = macosx;
13851431
SKIP_INSTALL = YES;
1386-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1432+
SWIFT_COMPILATION_MODE = wholemodule;
1433+
SWIFT_OPTIMIZATION_LEVEL = "-O";
13871434
};
13881435
name = Release;
13891436
};
@@ -1401,7 +1448,12 @@
14011448
"$(PROJECT_DIR)/Carthage/Build/Mac",
14021449
);
14031450
INFOPLIST_FILE = Configs/ServiceStackTests.plist;
1404-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/Mac";
1451+
LD_RUNPATH_SEARCH_PATHS = (
1452+
"$(inherited)",
1453+
"@executable_path/../Frameworks",
1454+
"@loader_path/../Frameworks",
1455+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1456+
);
14051457
MACOSX_DEPLOYMENT_TARGET = 10.11;
14061458
PRODUCT_BUNDLE_IDENTIFIER = "com.ServiceStack.ServiceStack-macOS-Tests";
14071459
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1425,13 +1477,19 @@
14251477
"$(PROJECT_DIR)/Carthage/Build/Mac",
14261478
);
14271479
INFOPLIST_FILE = Configs/ServiceStackTests.plist;
1428-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/Mac";
1480+
LD_RUNPATH_SEARCH_PATHS = (
1481+
"$(inherited)",
1482+
"@executable_path/../Frameworks",
1483+
"@loader_path/../Frameworks",
1484+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1485+
);
14291486
MACOSX_DEPLOYMENT_TARGET = 10.11;
14301487
PRODUCT_BUNDLE_IDENTIFIER = "com.ServiceStack.ServiceStack-macOS-Tests";
14311488
PRODUCT_NAME = "$(TARGET_NAME)";
14321489
PROVISIONING_PROFILE_SPECIFIER = "";
14331490
SDKROOT = macosx;
1434-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1491+
SWIFT_COMPILATION_MODE = wholemodule;
1492+
SWIFT_OPTIMIZATION_LEVEL = "-O";
14351493
};
14361494
name = Release;
14371495
};
@@ -1445,7 +1503,12 @@
14451503
"$(PROJECT_DIR)/Carthage/Build/tvOS",
14461504
);
14471505
INFOPLIST_FILE = Configs/ServiceStackTests.plist;
1448-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/tvOS";
1506+
LD_RUNPATH_SEARCH_PATHS = (
1507+
"$(inherited)",
1508+
"@executable_path/Frameworks",
1509+
"@loader_path/Frameworks",
1510+
"$(PROJECT_DIR)/Carthage/Build/tvOS",
1511+
);
14491512
PRODUCT_BUNDLE_IDENTIFIER = "com.ServiceStack.ServiceStack-tvOS-Tests";
14501513
PRODUCT_NAME = "$(TARGET_NAME)";
14511514
SDKROOT = appletvos;
@@ -1464,11 +1527,17 @@
14641527
"$(PROJECT_DIR)/Carthage/Build/tvOS",
14651528
);
14661529
INFOPLIST_FILE = Configs/ServiceStackTests.plist;
1467-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/tvOS";
1530+
LD_RUNPATH_SEARCH_PATHS = (
1531+
"$(inherited)",
1532+
"@executable_path/Frameworks",
1533+
"@loader_path/Frameworks",
1534+
"$(PROJECT_DIR)/Carthage/Build/tvOS",
1535+
);
14681536
PRODUCT_BUNDLE_IDENTIFIER = "com.ServiceStack.ServiceStack-tvOS-Tests";
14691537
PRODUCT_NAME = "$(TARGET_NAME)";
14701538
SDKROOT = appletvos;
1471-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1539+
SWIFT_COMPILATION_MODE = wholemodule;
1540+
SWIFT_OPTIMIZATION_LEVEL = "-O";
14721541
TVOS_DEPLOYMENT_TARGET = 9.1;
14731542
};
14741543
name = Release;

0 commit comments

Comments
 (0)