Merge pull request #96 from smartmobilefactory/feature/swiftlint

add new Swiftlint Rules

Author: kmeinh

SwiftLint/swiftlint.yml

@@ -15,6 +15,7 @@ disabled_rules:
   - switch_case_alignment
   - empty_enum_arguments # case .unexpectedSituation(_): ... is not allowed
   - duplicate_enum_cases
+  - identifier_name
 
 # paths to ignore during linting. overridden by `included`.
 excluded:
@@ -54,6 +55,35 @@ opt_in_rules:
   - identical_operands
   - collection_alignment
   - empty_xctest_method
+  - array_init
+  - contains_over_filter_count
+  - contains_over_filter_is_empty
+  - contains_over_first_not_nil
+  - empty_collection_literal
+  - empty_string
+  - explicit_self
+  - file_name
+  - for_where
+  - joined_default_parameter
+  - last_where
+  - legacy_multiple
+  - literal_expression_end_indentation
+  - lower_acl_than_parent
+  - modifier_order
+  - multiline_arguments
+  - multiline_function_chains
+  - multiline_literal_brackets
+  - convenience_type
+  - overridden_super_call
+  - redundant_type_annotation
+  - sorted_first_last
+  - static_operator
+  - toggle_bool
+  - unowned_variable_capture
+  - unused_import
+  - vertical_whitespace_closing_braces
+  - single_test_class
+  - strong_iboutlet
 
 # rule parameters
 file_length:
@@ -86,23 +116,6 @@ large_tuple:
   warning: 4
   error: 6
 
-identifier_name:
-  excluded:
-    - to
-    - id
-    - by
-    - of
-    - at
-    - in
-    - !str on
-    - x
-    - y
-    - L
-  # Allow the usage of underscores at the start of variables or constants. The lowercase check has currently to be disabled as "_" isn't considered as lowercase character
-  validates_start_lowercase: false
-  allowed_symbols:
-    - _
-
 type_name:
   min_length: 3
   max_length: 60
@@ -129,11 +142,6 @@ custom_rules:
       - typeidentifier
       - number
       - identifier
-  unnecessary_datatype:
-    name: "Unnecessary Datatype"
-    regex: '(?m-s)(let|var).*(:\s\[+(\w|:| |\t)+\]+\s*=\s*\[:*\])'
-    message: "Unnecessary datatype. Use '= [DataType]()' instead of ': [DataType] = []'"
-    severity: warning
   missing_closure_name:
     name: "Missing closure name"
     regex: '^\s*\}\) \{.*'
@@ -155,7 +163,7 @@ custom_rules:
       - doccomment.field
   empty_first_line:
     name: "Empty First Line"
-    regex: '(extension|class|struct) (?!(?:func|let|var))[^\{]*\{[^\n]*\n[\t ]*\w+'
+    regex: '(extension|class|struct|protocol) (?!(?:func|let|var))[^\{]*\{[^\n]*\n[\t ]*\w+'
     message: "There should be an empty line after a class or extension declaration."
     severity: warning
     match_kinds:

Xcode/check-xcode-version.sh

@@ -7,6 +7,8 @@ let env = ProcessInfo.processInfo.environment
 guard
 	let path = env["PROJECT_DIR"],
 	var url = URL(string: "file://" + path),
+	let projectPath = env["PROJECT_FILE_PATH"],
+	let xcodeVersionMajor = env["XCODE_VERSION_MAJOR"],
 	let xcodeVersion = env["XCODE_VERSION_ACTUAL"] else {
 		exit(0)
 }
@@ -18,14 +20,24 @@ guard
 	let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
 	let project = json["project"] as? [String: Any],
 	let projectXcodeVersion = project["xcode_version"] as? String else {
-		fatalError("'xcode_version' not found, please check your Config.json")
+		print("\(projectPath):1:1: error: Xcode Version not found in Config.json")
+		exit(1)
 }
 
 let xcodeVersionCleaned = xcodeVersion.trimmingCharacters(in: .init(charactersIn: "0"))
-let projectXcodeVersionCleaned = projectXcodeVersion.replacingOccurrences(of: ".", with: "")
+let projectXcodeVersionCleaned = projectXcodeVersion.replacingOccurrences(of: ".", with: "").trimmingCharacters(in: .init(charactersIn: "0"))
+
+let projectXcodeVersionMajorCleaned = projectXcodeVersion.split(separator: ".")[0].trimmingCharacters(in: .init(charactersIn: "0"))
+let xcodeVersionMajorCleaned = xcodeVersionMajor.trimmingCharacters(in: .init(charactersIn: "0"))
+
+if (projectXcodeVersionMajorCleaned != xcodeVersionMajorCleaned) {
+	print("\(projectPath):1:1: error: Xcode Version does not match Config.json. Please use Xcode-\(projectXcodeVersion) or change Config.json")
+	exit(1)
+}
 
 if (xcodeVersionCleaned != projectXcodeVersionCleaned) {
-	fatalError("Xcode Version mismatch: please open Project with Xcode \(projectXcodeVersion) or change Xcode Version in Config.json")
+	print("\(projectPath):1:1: warning: Xcode Version does not match Config.json. Please consider using Xcode-\(projectXcodeVersion) or change Config.json")
+	exit(0)
 }
 
 exit(0)