Merge branch 'develop'

zigzagg16 · Feb 7, 2019 · 3861c34 · 3861c34
2 parents b20ee27 + 6b216d4
commit 3861c34
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 40 deletions.
diff --git a/Barceloneta.xcodeproj/project.pbxproj b/Barceloneta.xcodeproj/project.pbxproj
@@ -207,7 +207,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = "Arnaud Schloune";
 				TargetAttributes = {
 					FAB0B4341CEBB0BC00CE2FF6 = {
@@ -286,7 +286,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -366,12 +366,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -420,12 +422,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -468,7 +472,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Barceloneta-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -484,7 +488,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Barceloneta-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Barceloneta/AppDelegate.swift b/Barceloneta/AppDelegate.swift
@@ -1,11 +1,3 @@
-//
-//  AppDelegate.swift
-//  Barceloneta
-//
-//  Created by Arnaud Schloune on 17/05/16.
-//  Copyright © 2016 Arnaud Schloune. All rights reserved.
-//
-
 import UIKit
 
 @UIApplicationMain
@@ -27,8 +19,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, COSTouchVisualizerWindowD
 //        return customWindow
 //    }()
 
-    func application(_ application: UIApplication,
-                     didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    // swiftlint:disable:next line_length
+    private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Barceloneta/Library/Barceloneta.swift b/Barceloneta/Library/Barceloneta.swift
@@ -64,6 +64,7 @@ open class Barceloneta: UIView {
     ///Timer and increment settings
     public var timerSettings: [TimerSetting] = []
     ///The delegate, to receive events
+    //swiftlint:disable:next weak_delegate
     weak var delegate: BarcelonetaDelegate?
     ///The axis on which the view can be dragged
     public var axis: Axis = .vertical
@@ -112,7 +113,7 @@ open class Barceloneta: UIView {
 
         handlePanning(translation: axis == .vertical ? sender.translation(in: self).y : sender.translation(in: self).x)
 
-        if sender.state == UIGestureRecognizerState.ended { endedPanning() }
+        if sender.state == UIGestureRecognizer.State.ended { endedPanning() }
     }
 
     ///The user started dragging the view
@@ -242,7 +243,7 @@ open class Barceloneta: UIView {
                        delay: 0,
                        usingSpringWithDamping: 0.2,
                        initialSpringVelocity: 25,
-                       options: UIViewAnimationOptions.allowUserInteraction,
+                       options: UIView.AnimationOptions.allowUserInteraction,
                        animations: { () -> Void in
             self.superview!.layoutIfNeeded()
         })

diff --git a/Barceloneta/ViewController.swift b/Barceloneta/ViewController.swift
@@ -1,11 +1,3 @@
-//
-//  ViewController.swift
-//  Barceloneta
-//
-//  Created by Arnaud Schloune on 17/05/16.
-//  Copyright © 2016 Arnaud Schloune. All rights reserved.
-//
-
 import UIKit
 
 class ViewController: UIViewController {

diff --git a/BarcelonetaTests/BarcelonetaTests.swift b/BarcelonetaTests/BarcelonetaTests.swift
@@ -1,11 +1,3 @@
-//
-//  BarcelonetaTests.swift
-//  BarcelonetaTests
-//
-//  Created by Arnaud Schloune on 03/11/17.
-//  Copyright © 2017 Arnaud Schloune. All rights reserved.
-//
-
 import XCTest
 @testable import Barceloneta
 

diff --git a/BarcelonetaUITests/BarcelonetaUITests.swift b/BarcelonetaUITests/BarcelonetaUITests.swift
@@ -1,11 +1,3 @@
-//
-//  BarcelonetaUITests.swift
-//  BarcelonetaUITests
-//
-//  Created by Arnaud Schloune on 17/05/16.
-//  Copyright © 2016 Arnaud Schloune. All rights reserved.
-//
-
 import XCTest
 
 class BarcelonetaUITests: XCTestCase {