Skip to content

Commit

Permalink
Merge branch 'hotfix/1.5.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
philprime committed Aug 7, 2019
2 parents 596111b + 49ca29c commit 94c1579
Show file tree
Hide file tree
Showing 12 changed files with 300 additions and 72 deletions.
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata

## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xcscmblueprint
xcuserdata

## Obj-C/Swift specific
*.hmap
Expand All @@ -37,5 +37,15 @@ playground.xcworkspace

# Carthage
Carthage/Build
Example/Pods
derived_data

# Cocoapods
Example/Pods/Local Podspecs
Example/Pods/Nimble
Example/Pods/Quick
Example/Pods/Swiftlint

# Xcode Schemes, so Carthage doesn't complain
!Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TPPDF.xcscheme
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF_Tests.xcscheme
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PODS:
- Nimble (8.0.2)
- Quick (2.1.0)
- SwiftLint (0.33.0)
- TPPDF (1.5.1):
- SwiftLint (0.34.0)
- TPPDF (1.5.4):
- SwiftLint

DEPENDENCIES:
Expand All @@ -23,8 +23,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
TPPDF: 58727d44e2275148342164934b0f5b14c8924f8a
SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
TPPDF: 775e9780261879da1af7c802f9e4bf7feb877677

PODFILE CHECKSUM: 72831a7ced7b912394f864c2ffd8f8f0fac7bfd5

Expand Down
8 changes: 4 additions & 4 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 80 additions & 0 deletions Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TPPDF.xcscheme

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Example/Pods/Target Support Files/Nimble/Nimble-Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Example/Pods/Target Support Files/Quick/Quick-Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Example/Pods/Target Support Files/TPPDF/TPPDF-Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 94c1579

Please sign in to comment.