Merge pull request #95 from smartmobilefactory/feature/swiftlint

Feature/swiftlint

Author: Tomusm

SwiftLint/swiftlint.yml

@@ -153,17 +153,9 @@ custom_rules:
       - comment
       - doccomment
       - doccomment.field
-  comments_capitalized_ignore_possible_code:
-    name: "Capitalize First Word In Comment"
-    regex: '(// +(?!swiftlint)[a-z]+)'
-    message: "The first word of a comment should be capitalized"
-    severity: warning
-    match_kinds:
-      - comment
-      - doccomment
   empty_first_line:
     name: "Empty First Line"
-    regex: '(extension|class) (?!(?:func|let|var))[^\{]*\{[^\n]*\n[\t ]*\w+'
+    regex: '(extension|class|struct) (?!(?:func|let|var))[^\{]*\{[^\n]*\n[\t ]*\w+'
     message: "There should be an empty line after a class or extension declaration."
     severity: warning
     match_kinds:
@@ -212,11 +204,6 @@ custom_rules:
     regex: '(^ *if \(((?!( is | > | < | (=|!|<|>)= )).)*\) \{)'
     message: "if should contain == true or == false"
     severity: warning
-  single_line_body:
-    name: "Single Line Body"
-    regex: '(?i-sm)((if|while|do|for)*? \{(?!\n|.?(s|g)et).+?\}\n)'
-    message: "Single line bodies are not allowed"
-    severity: warning
   missing_closure_datatype:
     name: "Missing Closure Data Type"
     regex: '(\{[\s]{1}(\[weak [\w]+?\][\s]{1})*?\([^:]+?\)[\s]{1}in)'

Xcode/check-xcode-version.swift

@@ -0,0 +1,31 @@
+#!/usr/bin/env xcrun --sdk macosx swift
+
+import Foundation
+
+let env = ProcessInfo.processInfo.environment
+
+guard
+	let path = env["PROJECT_DIR"],
+	var url = URL(string: "file://" + path),
+	let xcodeVersion = env["XCODE_VERSION_ACTUAL"] else {
+		exit(0)
+}
+
+url.appendPathComponent("Config.json")
+
+guard
+	let data = try? Data(contentsOf: url),
+	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")
+}
+
+let xcodeVersionCleaned = xcodeVersion.trimmingCharacters(in: .init(charactersIn: "0"))
+let projectXcodeVersionCleaned = projectXcodeVersion.replacingOccurrences(of: ".", with: "")
+
+if (xcodeVersionCleaned != projectXcodeVersionCleaned) {
+	fatalError("Xcode Version mismatch: please open Project with Xcode \(projectXcodeVersion) or change Xcode Version in Config.json")
+}
+
+exit(0)

setup-common-project-files.sh

@@ -151,5 +151,5 @@ if [ $copyPRTemplate = true ]; then
 fi
 
 if [ $checkXcodeVersion = true ]; then
-	./Xcode/check-xcode-version.sh "$projectDir" || exit 1;
+	./Xcode/check-xcode-version.swift;
 fi