Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 8289ac4

Browse files
authored
Merge pull request #5 from watson-developer-cloud/swift4
Update project to Swift 4
2 parents cf0f3d7 + 1605089 commit 8289ac4

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "watson-developer-cloud/ios-sdk"
1+
github "watson-developer-cloud/swift-sdk"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "watson-developer-cloud/ios-sdk" "v0.9.1"
1+
github "watson-developer-cloud/swift-sdk" "v0.18.0"

Text to Speech.xcodeproj/project.pbxproj

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
isa = PBXProject;
118118
attributes = {
119119
LastSwiftUpdateCheck = 0810;
120-
LastUpgradeCheck = 0810;
120+
LastUpgradeCheck = 0900;
121121
ORGANIZATIONNAME = "IBM Watson Developer Cloud";
122122
TargetAttributes = {
123123
7A261F781DDB8CBE00B6FAFA = {
@@ -219,15 +219,22 @@
219219
CLANG_CXX_LIBRARY = "libc++";
220220
CLANG_ENABLE_MODULES = YES;
221221
CLANG_ENABLE_OBJC_ARC = YES;
222+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
222223
CLANG_WARN_BOOL_CONVERSION = YES;
224+
CLANG_WARN_COMMA = YES;
223225
CLANG_WARN_CONSTANT_CONVERSION = YES;
224226
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
225227
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
226228
CLANG_WARN_EMPTY_BODY = YES;
227229
CLANG_WARN_ENUM_CONVERSION = YES;
228230
CLANG_WARN_INFINITE_RECURSION = YES;
229231
CLANG_WARN_INT_CONVERSION = YES;
232+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
233+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
230234
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
235+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
236+
CLANG_WARN_STRICT_PROTOTYPES = YES;
237+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
231238
CLANG_WARN_SUSPICIOUS_MOVES = YES;
232239
CLANG_WARN_UNREACHABLE_CODE = YES;
233240
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -256,6 +263,7 @@
256263
SDKROOT = iphoneos;
257264
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
258265
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
266+
SWIFT_VERSION = 4.0;
259267
TARGETED_DEVICE_FAMILY = "1,2";
260268
};
261269
name = Debug;
@@ -269,15 +277,22 @@
269277
CLANG_CXX_LIBRARY = "libc++";
270278
CLANG_ENABLE_MODULES = YES;
271279
CLANG_ENABLE_OBJC_ARC = YES;
280+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
272281
CLANG_WARN_BOOL_CONVERSION = YES;
282+
CLANG_WARN_COMMA = YES;
273283
CLANG_WARN_CONSTANT_CONVERSION = YES;
274284
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
275285
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
276286
CLANG_WARN_EMPTY_BODY = YES;
277287
CLANG_WARN_ENUM_CONVERSION = YES;
278288
CLANG_WARN_INFINITE_RECURSION = YES;
279289
CLANG_WARN_INT_CONVERSION = YES;
290+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
291+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
280292
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
293+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
294+
CLANG_WARN_STRICT_PROTOTYPES = YES;
295+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
281296
CLANG_WARN_SUSPICIOUS_MOVES = YES;
282297
CLANG_WARN_UNREACHABLE_CODE = YES;
283298
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -298,6 +313,7 @@
298313
MTL_ENABLE_DEBUG_INFO = NO;
299314
SDKROOT = iphoneos;
300315
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
316+
SWIFT_VERSION = 4.0;
301317
TARGETED_DEVICE_FAMILY = "1,2";
302318
VALIDATE_PRODUCT = YES;
303319
};
@@ -315,7 +331,7 @@
315331
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
316332
PRODUCT_BUNDLE_IDENTIFIER = "com.ibm.watson.developer-cloud.Text-to-Speech";
317333
PRODUCT_NAME = "$(TARGET_NAME)";
318-
SWIFT_VERSION = 3.0;
334+
SWIFT_VERSION = 4.0;
319335
};
320336
name = Debug;
321337
};
@@ -331,7 +347,7 @@
331347
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
332348
PRODUCT_BUNDLE_IDENTIFIER = "com.ibm.watson.developer-cloud.Text-to-Speech";
333349
PRODUCT_NAME = "$(TARGET_NAME)";
334-
SWIFT_VERSION = 3.0;
350+
SWIFT_VERSION = 4.0;
335351
};
336352
name = Release;
337353
};

0 commit comments

Comments
 (0)