Merge branch 'feature/update-project-structure' into develop

chrs1885 · Oct 17, 2019 · cd49b00 · cd49b00
2 parents bcda22c + 3a35aa7
commit cd49b00
Show file tree

Hide file tree

Showing 267 changed files with 5,735 additions and 17,688 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,4 +54,3 @@ Example/Pods/
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 Carthage/Checkouts
 
-Carthage/Build
diff --git a/.jazzy.yaml b/.jazzy.yaml
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.0
+5.0
diff --git a/.swiftformat b/.swiftformat
@@ -0,0 +1 @@
+--exclude .build, Example/Pods
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -5,17 +5,15 @@ disabled_rules: # rule identifiers to exclude from running
   - line_length
   - nesting
   - type_body_length
-  - variable_name
+  - identifier_name
 opt_in_rules: # some rules are only opt-in
   - colon
   - comma
   - control_statement
   - empty_count
   - trailing_newline
-included: # paths to include during linting. `--path` is ignored if present.
-  - Source
-  - Tests
-excluded: # paths to ignore during linting. Takes precedence over `included`.
-
-cyclomatic_complexity:
-    ignores_case_statements: true
+included:
+  - Source/
+excluded:
+  - .build/*
+  - Example/Pods/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Version 1.1.1
+
+### Enhancements
+* Add SPM support for iOS, macOS, tvOS, and watchOS
+* Update project structure to match the CocoaPods lib template
+* Improve development tooling by adding SwiftFormat, SwiftLint, and SourceDocs (replacement for Jazzy)
+
 ## Version 1.1.0
 
 ### Features

diff --git a/Capable.xcodeproj/project.pbxproj b/Capable.xcodeproj/project.pbxproj
diff --git a/Capable.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Capable.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Capable.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Capable.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...cbaselines/83DA75F02065167600303D8F.xcbaseline/EB7FCBA4-87ED-4F09-BBB2-B815D78DFC46.plist b/...cbaselines/83DA75F02065167600303D8F.xcbaseline/EB7FCBA4-87ED-4F09-BBB2-B815D78DFC46.plist
diff --git a/Capable.xcodeproj/xcshareddata/xcbaselines/83DA75F02065167600303D8F.xcbaseline/Info.plist b/Capable.xcodeproj/xcshareddata/xcbaselines/83DA75F02065167600303D8F.xcbaseline/Info.plist
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved