Skip to content

Commit 409e85f

Browse files
Панкова Мария ВитальевнаПанкова Мария Витальевна
Панкова Мария Витальевна
authored and
Панкова Мария Витальевна
committed
[Swift 4.2] Update Convex Hull
1 parent f08d5fc commit 409e85f

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

Convex Hull/Convex Hull.xcodeproj/project.pbxproj

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
isa = PBXProject;
140140
attributes = {
141141
LastSwiftUpdateCheck = 0900;
142-
LastUpgradeCheck = 0820;
142+
LastUpgradeCheck = 1000;
143143
ORGANIZATIONNAME = Workmoose;
144144
TargetAttributes = {
145145
1CB6142C1F89456C00A14493 = {
@@ -254,7 +254,7 @@
254254
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
255255
PRODUCT_BUNDLE_IDENTIFIER = com.mnespor.Tests;
256256
PRODUCT_NAME = "$(TARGET_NAME)";
257-
SWIFT_VERSION = 4.0;
257+
SWIFT_VERSION = 4.2;
258258
TARGETED_DEVICE_FAMILY = "1,2";
259259
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Convex Hull.app/Convex Hull";
260260
};
@@ -281,7 +281,7 @@
281281
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
282282
PRODUCT_BUNDLE_IDENTIFIER = com.mnespor.Tests;
283283
PRODUCT_NAME = "$(TARGET_NAME)";
284-
SWIFT_VERSION = 4.0;
284+
SWIFT_VERSION = 4.2;
285285
TARGETED_DEVICE_FAMILY = "1,2";
286286
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Convex Hull.app/Convex Hull";
287287
};
@@ -296,15 +296,23 @@
296296
CLANG_CXX_LIBRARY = "libc++";
297297
CLANG_ENABLE_MODULES = YES;
298298
CLANG_ENABLE_OBJC_ARC = YES;
299+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
299300
CLANG_WARN_BOOL_CONVERSION = YES;
301+
CLANG_WARN_COMMA = YES;
300302
CLANG_WARN_CONSTANT_CONVERSION = YES;
303+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
301304
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
302305
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
303306
CLANG_WARN_EMPTY_BODY = YES;
304307
CLANG_WARN_ENUM_CONVERSION = YES;
305308
CLANG_WARN_INFINITE_RECURSION = YES;
306309
CLANG_WARN_INT_CONVERSION = YES;
310+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
311+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
312+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
307313
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
314+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
315+
CLANG_WARN_STRICT_PROTOTYPES = YES;
308316
CLANG_WARN_SUSPICIOUS_MOVE = YES;
309317
CLANG_WARN_UNREACHABLE_CODE = YES;
310318
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -346,15 +354,23 @@
346354
CLANG_CXX_LIBRARY = "libc++";
347355
CLANG_ENABLE_MODULES = YES;
348356
CLANG_ENABLE_OBJC_ARC = YES;
357+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
349358
CLANG_WARN_BOOL_CONVERSION = YES;
359+
CLANG_WARN_COMMA = YES;
350360
CLANG_WARN_CONSTANT_CONVERSION = YES;
361+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
351362
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
352363
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
353364
CLANG_WARN_EMPTY_BODY = YES;
354365
CLANG_WARN_ENUM_CONVERSION = YES;
355366
CLANG_WARN_INFINITE_RECURSION = YES;
356367
CLANG_WARN_INT_CONVERSION = YES;
368+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
369+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
370+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
357371
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
372+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
373+
CLANG_WARN_STRICT_PROTOTYPES = YES;
358374
CLANG_WARN_SUSPICIOUS_MOVE = YES;
359375
CLANG_WARN_UNREACHABLE_CODE = YES;
360376
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -389,7 +405,7 @@
389405
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
390406
PRODUCT_BUNDLE_IDENTIFIER = "workmoose.Convex-Hull";
391407
PRODUCT_NAME = "$(TARGET_NAME)";
392-
SWIFT_VERSION = 4.0;
408+
SWIFT_VERSION = 4.2;
393409
};
394410
name = Debug;
395411
};
@@ -402,7 +418,7 @@
402418
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
403419
PRODUCT_BUNDLE_IDENTIFIER = "workmoose.Convex-Hull";
404420
PRODUCT_NAME = "$(TARGET_NAME)";
405-
SWIFT_VERSION = 4.0;
421+
SWIFT_VERSION = 4.2;
406422
};
407423
name = Release;
408424
};

Convex Hull/Convex Hull.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
language = ""
1413
shouldUseLaunchSchemeArgsEnv = "YES">
1514
<Testables>
1615
<TestableReference
@@ -31,7 +30,6 @@
3130
buildConfiguration = "Debug"
3231
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3332
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34-
language = ""
3533
launchStyle = "0"
3634
useCustomWorkingDirectory = "NO"
3735
ignoresPersistentStateOnLaunch = "NO"

Convex Hull/Convex Hull/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
8792
}
8893
],
8994
"info" : {

Convex Hull/Convex Hull/View.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class View: UIView {
2727
func generateRandomPoints() {
2828
for _ in 0..<MAX_POINTS {
2929
let offset: CGFloat = 50
30-
let xrand = CGFloat(arc4random()) / CGFloat(UINT32_MAX) * (self.frame.width - offset) + 0.5 * offset
31-
let yrand = CGFloat(arc4random()) / CGFloat(UINT32_MAX) * (self.frame.height - offset) + 0.5 * offset
30+
let xrand = CGFloat(arc4random()) / CGFloat(UInt32.max) * (self.frame.width - offset) + 0.5 * offset
31+
let yrand = CGFloat(arc4random()) / CGFloat(UInt32.max) * (self.frame.height - offset) + 0.5 * offset
3232
let point = CGPoint(x: xrand, y: yrand)
3333
points.append(point)
3434
}

0 commit comments

Comments
 (0)