Merge pull request #8 from tbaranes/feature/swiftlint_0.17.0

Bump SwiftLint 0.17.0 and Xcode 8.3
tbaranes · Mar 28, 2017 · 175176f · 175176f
2 parents 66f43a9 + bde3062
commit 175176f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@ language: objective-c
 osx_image: xcode8
 notifications:
   email: false
+branches:
+  only: 
+    - master  
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
@@ -21,3 +24,6 @@ script:
   - if [ $BUILD_EXAMPLE == "YES" ]; then
       xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
+
+after_success:
+   - sleep 5 # Workaround for https://github.com/travis-ci/travis-ci/issues/4725    
diff --git a/AdaptiveSpaceItem Example/.swiftlint.yml b/AdaptiveSpaceItem Example/.swiftlint.yml
@@ -0,0 +1,30 @@
+identifier_name:
+  min_length: 2
+  excluded: 
+   - x
+
+type_name:
+  excluded: 
+   - T
+
+line_length: 150
+file_length: 500
+number_separator:
+  minimum_length: 5
+
+opt_in_rules:
+ - closure_spacing
+ - conditional_returns_on_newline
+ - empty_count
+ - explicit_init
+ - overridden_super_call
+ - redundant_nil_coalescing
+ - nimble_operator
+ - closure_end_indentation
+ - first_where
+ - attributes
+ - operator_usage_whitespace
+ - prohibited_super_call
+ - number_separator
+ - object_literal
+ - fatal_error_message
diff --git a/AdaptiveSpaceItem Example/macOS Example.xcodeproj/project.pbxproj b/AdaptiveSpaceItem Example/macOS Example.xcodeproj/project.pbxproj
@@ -140,7 +140,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = Recisio;
 				TargetAttributes = {
 					E24C8F801C761258000EEF6B = {
@@ -246,8 +246,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -290,8 +292,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";

diff --git a/...em Example/macOS Example.xcodeproj/xcshareddata/xcschemes/AdaptiveSpaceItem Demo.xcscheme b/...em Example/macOS Example.xcodeproj/xcshareddata/xcschemes/AdaptiveSpaceItem Demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AdaptiveSpaceItem/AdaptiveSpaceItem.xcodeproj/project.pbxproj b/AdaptiveSpaceItem/AdaptiveSpaceItem.xcodeproj/project.pbxproj
@@ -151,7 +151,7 @@
 		E2E0055F1D3D70C90003C134 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = Recisio;
 				TargetAttributes = {
 					E2E005671D3D70C90003C134 = {
@@ -263,8 +263,10 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -311,8 +313,10 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -332,6 +336,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

diff --git a/...veSpaceItem/AdaptiveSpaceItem.xcodeproj/xcshareddata/xcschemes/AdaptiveSpaceItem.xcscheme b/...veSpaceItem/AdaptiveSpaceItem.xcodeproj/xcshareddata/xcschemes/AdaptiveSpaceItem.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"