Merge branch 'release/1.1.2'

chrs1885 · Feb 5, 2020 · 9f9bf5c · 9f9bf5c
2 parents bcda22c + 2a8722f
commit 9f9bf5c
Show file tree

Hide file tree

Showing 298 changed files with 11,271 additions and 17,801 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,12 +46,12 @@ playground.xcworkspace
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-Example/Pods/
+Example/Pods/*
+!Example/Pods/Pods.xcodeproj/*
+!Example/Pods/Target Support Files/Capable-*
 
 # Carthage
 #
 # 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,15 @@
+## Version 1.1.2
+
+### Bugfixes
+* [Add Carthage support by sharing Pod schemes](https://github.com/chrs1885/Capable/pull/49) *(Thanks to @jefflen)*
+
+## 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.podspec b/Capable.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'Capable'
- s.version = '1.1.0'
+ s.version = '1.1.2'
  s.summary = 'Keep track of accessibility settings, leverage high contrast colors, and use scalable fonts to enable users with disabilities to use your app.'
 
  s.description = <<-DESC

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/...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