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

Commit ae94aec

Browse files
pbodskpbodsk
authored
Merge pull request #40 from nodes-ios/develop
Develop
2 parents 02c14f9 + 60a6beb commit ae94aec

File tree

8 files changed

+63
-45
lines changed

8 files changed

+63
-45
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: swift
2-
osx_image: xcode9.1
2+
osx_image: xcode10.1
33
branches:
44
only:
55
- master
@@ -10,12 +10,12 @@ env:
1010
- IOS_FRAMEWORK_SCHEME="Spinner"
1111
- TVOS_FRAMEWORK_SCHEME="Spinner-tvOS"
1212

13-
- IOS_SDK=iphonesimulator11.1
14-
- TVOS_SDK=appletvsimulator11.1
13+
- IOS_SDK=iphonesimulator12.1
14+
- TVOS_SDK=appletvsimulator12.1
1515

1616
matrix:
17-
- DESTINATION="OS=11.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
18-
- DESTINATION="OS=11.1,name=Apple TV 4K (at 1080p)" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES"
17+
- DESTINATION="OS=12.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
18+
- DESTINATION="OS=12.1,name=Apple TV 4K (at 1080p)" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES"
1919

2020
script:
2121
- set -o pipefail

‎Spinner.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
isa = PBXProject;
245245
attributes = {
246246
LastSwiftUpdateCheck = 0800;
247-
LastUpgradeCheck = 0910;
247+
LastUpgradeCheck = 1010;
248248
ORGANIZATIONNAME = Nodes;
249249
TargetAttributes = {
250250
275BCA281C57C50A00FF3647 = {
@@ -381,12 +381,14 @@
381381
CLANG_WARN_BOOL_CONVERSION = YES;
382382
CLANG_WARN_COMMA = YES;
383383
CLANG_WARN_CONSTANT_CONVERSION = YES;
384+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
384385
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
385386
CLANG_WARN_EMPTY_BODY = YES;
386387
CLANG_WARN_ENUM_CONVERSION = YES;
387388
CLANG_WARN_INFINITE_RECURSION = YES;
388389
CLANG_WARN_INT_CONVERSION = YES;
389390
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
391+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
390392
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
391393
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
392394
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -437,12 +439,14 @@
437439
CLANG_WARN_BOOL_CONVERSION = YES;
438440
CLANG_WARN_COMMA = YES;
439441
CLANG_WARN_CONSTANT_CONVERSION = YES;
442+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
440443
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
441444
CLANG_WARN_EMPTY_BODY = YES;
442445
CLANG_WARN_ENUM_CONVERSION = YES;
443446
CLANG_WARN_INFINITE_RECURSION = YES;
444447
CLANG_WARN_INT_CONVERSION = YES;
445448
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
449+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
446450
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
447451
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
448452
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -490,8 +494,8 @@
490494
PRODUCT_NAME = Spinner;
491495
SKIP_INSTALL = YES;
492496
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
493-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
494-
SWIFT_VERSION = 4.0;
497+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
498+
SWIFT_VERSION = 4.2;
495499
};
496500
name = Debug;
497501
};
@@ -511,8 +515,8 @@
511515
PRODUCT_NAME = Spinner;
512516
SKIP_INSTALL = YES;
513517
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
514-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
515-
SWIFT_VERSION = 4.0;
518+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
519+
SWIFT_VERSION = 4.2;
516520
};
517521
name = Release;
518522
};
@@ -530,8 +534,8 @@
530534
PRODUCT_BUNDLE_IDENTIFIER = dk.nodes.SpinnerTests;
531535
PRODUCT_NAME = "$(TARGET_NAME)";
532536
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
533-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
534-
SWIFT_VERSION = 4.0;
537+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
538+
SWIFT_VERSION = 4.2;
535539
};
536540
name = Debug;
537541
};
@@ -549,8 +553,8 @@
549553
PRODUCT_BUNDLE_IDENTIFIER = dk.nodes.SpinnerTests;
550554
PRODUCT_NAME = "$(TARGET_NAME)";
551555
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
552-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
553-
SWIFT_VERSION = 4.0;
556+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
557+
SWIFT_VERSION = 4.2;
554558
};
555559
name = Release;
556560
};
@@ -575,7 +579,7 @@
575579
SDKROOT = appletvos;
576580
SKIP_INSTALL = YES;
577581
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
578-
SWIFT_VERSION = 3.0;
582+
SWIFT_VERSION = 4.2;
579583
TARGETED_DEVICE_FAMILY = 3;
580584
TVOS_DEPLOYMENT_TARGET = 9.0;
581585
};
@@ -602,7 +606,7 @@
602606
SDKROOT = appletvos;
603607
SKIP_INSTALL = YES;
604608
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
605-
SWIFT_VERSION = 3.0;
609+
SWIFT_VERSION = 4.2;
606610
TARGETED_DEVICE_FAMILY = 3;
607611
TVOS_DEPLOYMENT_TARGET = 9.0;
608612
};
@@ -623,7 +627,7 @@
623627
PRODUCT_NAME = "$(TARGET_NAME)";
624628
SDKROOT = appletvos;
625629
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
626-
SWIFT_VERSION = 3.0;
630+
SWIFT_VERSION = 4.2;
627631
TVOS_DEPLOYMENT_TARGET = 10.0;
628632
};
629633
name = Debug;
@@ -643,7 +647,7 @@
643647
PRODUCT_NAME = "$(TARGET_NAME)";
644648
SDKROOT = appletvos;
645649
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
646-
SWIFT_VERSION = 3.0;
650+
SWIFT_VERSION = 4.2;
647651
TVOS_DEPLOYMENT_TARGET = 10.0;
648652
};
649653
name = Release;

‎Spinner.xcodeproj/xcshareddata/xcschemes/Spinner-tvOS.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 = "0910"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎Spinner.xcodeproj/xcshareddata/xcschemes/Spinner.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 = "0910"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎Spinner/Spinner.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import UIKit
1010

11-
public typealias ControlTitleColor = (UIControlState, UIColor?)
12-
public typealias ControlTitleAttributes = (UIControlState, NSAttributedString?)
11+
public typealias ControlTitleColor = (UIControl.State, UIColor?)
12+
public typealias ControlTitleAttributes = (UIControl.State, NSAttributedString?)
1313

1414
/**
1515
Protocol for any view that can be used as a Spinner. Currently only has one dismiss
@@ -46,11 +46,11 @@ public class SpinnerView: NSObject, Spinner {
4646
- Returns: A reference to the Spinner that was created, so that it can be dismissed as needed.
4747
*/
4848

49-
public static func showSpinner(inView view: UIView, style: UIActivityIndicatorViewStyle = .white, color:UIColor? = nil, disablesUserInteraction: Bool = true, dimBackground: Bool = false) -> SpinnerView {
49+
public static func showSpinner(inView view: UIView, style: UIActivityIndicatorView.Style = .white, color:UIColor? = nil, disablesUserInteraction: Bool = true, dimBackground: Bool = false) -> SpinnerView {
5050
let center = CGPoint(x: view.bounds.size.width/2, y: view.bounds.size.height/2)
5151

5252

53-
let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: style)
53+
let activityIndicator = UIActivityIndicatorView(style: style)
5454

5555
let spinnerView = SpinnerView()
5656
spinnerView.userInteractionEnabledAtReception = view.isUserInteractionEnabled
@@ -99,7 +99,7 @@ public class SpinnerView: NSObject, Spinner {
9999

100100
- Returns: A reference to the Spinner that was created, so that it can be dismissed as needed.
101101
*/
102-
public static func showSpinner(inButton button: UIButton, style: UIActivityIndicatorViewStyle = .white, color:UIColor? = nil, disablesUserInteraction:Bool = true) -> SpinnerView {
102+
public static func showSpinner(inButton button: UIButton, style: UIActivityIndicatorView.Style = .white, color:UIColor? = nil, disablesUserInteraction:Bool = true) -> SpinnerView {
103103

104104
let spinnerView = showSpinner(inView: button, style: style, color: color)
105105
spinnerView.controlTitleColors = button.allTitleColors()
@@ -257,7 +257,7 @@ fileprivate extension UIButton {
257257
// Extension to return an array of every color for every button state
258258
fileprivate func allTitleColors() -> [ControlTitleColor] {
259259
var colors: [ControlTitleColor] = [
260-
(UIControlState(), titleColor(for: UIControlState())),
260+
(UIControl.State(), titleColor(for: UIControl.State())),
261261
(.highlighted, titleColor(for: .highlighted)),
262262
(.disabled, titleColor(for: .disabled)),
263263
(.selected, titleColor(for: .selected)),
@@ -274,7 +274,7 @@ fileprivate extension UIButton {
274274

275275
fileprivate func allTitleAttributes() -> [ControlTitleAttributes] {
276276
var attributes: [ControlTitleAttributes] = [
277-
(UIControlState(), attributedTitle(for: UIControlState())),
277+
(UIControl.State(), attributedTitle(for: UIControl.State())),
278278
(.highlighted, attributedTitle(for: .highlighted)),
279279
(.disabled, attributedTitle(for: .disabled)),
280280
(.selected, attributedTitle(for: .selected)),

‎SpinnerDemo/SpinnerDemo/SpinnerDemo.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
isa = PBXProject;
200200
attributes = {
201201
LastSwiftUpdateCheck = 0800;
202-
LastUpgradeCheck = 0800;
202+
LastUpgradeCheck = 1010;
203203
ORGANIZATIONNAME = Nodes;
204204
TargetAttributes = {
205205
D248C9551DAF8D4C003FD9F7 = {
@@ -339,15 +339,24 @@
339339
CLANG_CXX_LIBRARY = "libc++";
340340
CLANG_ENABLE_MODULES = YES;
341341
CLANG_ENABLE_OBJC_ARC = YES;
342+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
342343
CLANG_WARN_BOOL_CONVERSION = YES;
344+
CLANG_WARN_COMMA = YES;
343345
CLANG_WARN_CONSTANT_CONVERSION = YES;
346+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
344347
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
345348
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
346349
CLANG_WARN_EMPTY_BODY = YES;
347350
CLANG_WARN_ENUM_CONVERSION = YES;
348351
CLANG_WARN_INFINITE_RECURSION = YES;
349352
CLANG_WARN_INT_CONVERSION = YES;
353+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
354+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
355+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
350356
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
357+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
358+
CLANG_WARN_STRICT_PROTOTYPES = YES;
359+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
351360
CLANG_WARN_SUSPICIOUS_MOVES = YES;
352361
CLANG_WARN_UNREACHABLE_CODE = YES;
353362
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -389,15 +398,24 @@
389398
CLANG_CXX_LIBRARY = "libc++";
390399
CLANG_ENABLE_MODULES = YES;
391400
CLANG_ENABLE_OBJC_ARC = YES;
401+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
392402
CLANG_WARN_BOOL_CONVERSION = YES;
403+
CLANG_WARN_COMMA = YES;
393404
CLANG_WARN_CONSTANT_CONVERSION = YES;
405+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
394406
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
395407
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
396408
CLANG_WARN_EMPTY_BODY = YES;
397409
CLANG_WARN_ENUM_CONVERSION = YES;
398410
CLANG_WARN_INFINITE_RECURSION = YES;
399411
CLANG_WARN_INT_CONVERSION = YES;
412+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
413+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
414+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
400415
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
416+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
417+
CLANG_WARN_STRICT_PROTOTYPES = YES;
418+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
401419
CLANG_WARN_SUSPICIOUS_MOVES = YES;
402420
CLANG_WARN_UNREACHABLE_CODE = YES;
403421
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -432,7 +450,7 @@
432450
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
433451
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SpinnerDemo;
434452
PRODUCT_NAME = "$(TARGET_NAME)";
435-
SWIFT_VERSION = 3.0;
453+
SWIFT_VERSION = 4.2;
436454
};
437455
name = Debug;
438456
};
@@ -445,7 +463,7 @@
445463
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
446464
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SpinnerDemo;
447465
PRODUCT_NAME = "$(TARGET_NAME)";
448-
SWIFT_VERSION = 3.0;
466+
SWIFT_VERSION = 4.2;
449467
};
450468
name = Release;
451469
};
@@ -459,7 +477,7 @@
459477
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
460478
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SpinnerDemoTests;
461479
PRODUCT_NAME = "$(TARGET_NAME)";
462-
SWIFT_VERSION = 3.0;
480+
SWIFT_VERSION = 4.2;
463481
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SpinnerDemo.app/SpinnerDemo";
464482
};
465483
name = Debug;
@@ -474,7 +492,7 @@
474492
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
475493
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SpinnerDemoTests;
476494
PRODUCT_NAME = "$(TARGET_NAME)";
477-
SWIFT_VERSION = 3.0;
495+
SWIFT_VERSION = 4.2;
478496
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SpinnerDemo.app/SpinnerDemo";
479497
};
480498
name = Release;
@@ -488,7 +506,7 @@
488506
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
489507
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SpinnerDemoUITests;
490508
PRODUCT_NAME = "$(TARGET_NAME)";
491-
SWIFT_VERSION = 3.0;
509+
SWIFT_VERSION = 4.2;
492510
TEST_TARGET_NAME = SpinnerDemo;
493511
};
494512
name = Debug;
@@ -502,7 +520,7 @@
502520
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
503521
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SpinnerDemoUITests;
504522
PRODUCT_NAME = "$(TARGET_NAME)";
505-
SWIFT_VERSION = 3.0;
523+
SWIFT_VERSION = 4.2;
506524
TEST_TARGET_NAME = SpinnerDemo;
507525
};
508526
name = Release;

‎SpinnerDemo/SpinnerDemo/SpinnerDemo/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

0 commit comments

Comments
 (0)