Skip to content

Commit 94c1579

Browse files
committed
Merge branch 'hotfix/1.5.4'
2 parents 596111b + 49ca29c commit 94c1579

File tree

12 files changed

+300
-72
lines changed

12 files changed

+300
-72
lines changed

.gitignore

+12-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ DerivedData
1616
!default.mode2v3
1717
*.perspectivev3
1818
!default.perspectivev3
19-
xcuserdata
2019

2120
## Other
2221
*.xccheckout
2322
*.moved-aside
2423
*.xcuserstate
2524
*.xcscmblueprint
25+
xcuserdata
2626

2727
## Obj-C/Swift specific
2828
*.hmap
@@ -37,5 +37,15 @@ playground.xcworkspace
3737

3838
# Carthage
3939
Carthage/Build
40-
Example/Pods
4140
derived_data
41+
42+
# Cocoapods
43+
Example/Pods/Local Podspecs
44+
Example/Pods/Nimble
45+
Example/Pods/Quick
46+
Example/Pods/Swiftlint
47+
48+
# Xcode Schemes, so Carthage doesn't complain
49+
!Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TPPDF.xcscheme
50+
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme
51+
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF_Tests.xcscheme

Example/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
22
- Nimble (8.0.2)
33
- Quick (2.1.0)
4-
- SwiftLint (0.33.0)
5-
- TPPDF (1.5.1):
4+
- SwiftLint (0.34.0)
5+
- TPPDF (1.5.4):
66
- SwiftLint
77

88
DEPENDENCIES:
@@ -23,8 +23,8 @@ EXTERNAL SOURCES:
2323
SPEC CHECKSUMS:
2424
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
2525
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
26-
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
27-
TPPDF: 58727d44e2275148342164934b0f5b14c8924f8a
26+
SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
27+
TPPDF: 775e9780261879da1af7c802f9e4bf7feb877677
2828

2929
PODFILE CHECKSUM: 72831a7ced7b912394f864c2ffd8f8f0fac7bfd5
3030

Example/Pods/Manifest.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TPPDF.xcscheme

+80
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Nimble/Nimble-Info.plist

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Pods-TPPDF_Example/Pods-TPPDF_Example-Info.plist

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Pods-TPPDF_Tests/Pods-TPPDF_Tests-Info.plist

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Quick/Quick-Info.plist

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/SwiftLint/SwiftLint.xcconfig

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/TPPDF/TPPDF-Info.plist

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)