Skip to content

Commit

Permalink
Merge branch 'release/4.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
menno committed May 21, 2021
2 parents 121dd0e + 8541f6f commit fc1bb67
Show file tree
Hide file tree
Showing 334 changed files with 11,949 additions and 8,962 deletions.
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use_frameworks!
target 'Zoomy_Example' do
pod 'Zoomy', :path => '../'

pod "Texture"
pod "Texture", "~> 3.0"

target 'Zoomy_Tests' do
inherit! :search_paths
Expand Down
72 changes: 36 additions & 36 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
PODS:
- InjectableLoggers (2.0.0)
- PINCache (3.0.1-beta.6):
- PINCache/Arc-exception-safe (= 3.0.1-beta.6)
- PINCache/Core (= 3.0.1-beta.6)
- PINCache/Arc-exception-safe (3.0.1-beta.6):
- InjectableLoggers (2.1.1)
- PINCache (3.0.3):
- PINCache/Arc-exception-safe (= 3.0.3)
- PINCache/Core (= 3.0.3)
- PINCache/Arc-exception-safe (3.0.3):
- PINCache/Core
- PINCache/Core (3.0.1-beta.6):
- PINOperation (~> 1.1.0)
- PINOperation (1.1.2)
- PINRemoteImage/Core (3.0.0-beta.13):
- PINCache/Core (3.0.3):
- PINOperation (~> 1.2.1)
- PINOperation (1.2.1)
- PINRemoteImage/Core (3.0.3):
- PINOperation
- PINRemoteImage/iOS (3.0.0-beta.13):
- PINRemoteImage/iOS (3.0.3):
- PINRemoteImage/Core
- PINRemoteImage/PINCache (3.0.0-beta.13):
- PINCache (= 3.0.1-beta.6)
- PINRemoteImage/PINCache (3.0.3):
- PINCache (~> 3.0.3)
- PINRemoteImage/Core
- Texture (2.8.1):
- Texture/AssetsLibrary (= 2.8.1)
- Texture/Core (= 2.8.1)
- Texture/MapKit (= 2.8.1)
- Texture/Photos (= 2.8.1)
- Texture/PINRemoteImage (= 2.8.1)
- Texture/Video (= 2.8.1)
- Texture/AssetsLibrary (2.8.1):
- Texture (3.0.0):
- Texture/AssetsLibrary (= 3.0.0)
- Texture/Core (= 3.0.0)
- Texture/MapKit (= 3.0.0)
- Texture/Photos (= 3.0.0)
- Texture/PINRemoteImage (= 3.0.0)
- Texture/Video (= 3.0.0)
- Texture/AssetsLibrary (3.0.0):
- Texture/Core
- Texture/Core (2.8.1)
- Texture/MapKit (2.8.1):
- Texture/Core (3.0.0)
- Texture/MapKit (3.0.0):
- Texture/Core
- Texture/Photos (2.8.1):
- Texture/Photos (3.0.0):
- Texture/Core
- Texture/PINRemoteImage (2.8.1):
- PINRemoteImage/iOS (= 3.0.0-beta.13)
- Texture/PINRemoteImage (3.0.0):
- PINRemoteImage/iOS (~> 3.0.0)
- PINRemoteImage/PINCache
- Texture/Core
- Texture/Video (2.8.1):
- Texture/Video (3.0.0):
- Texture/Core
- Zoomy (4.0.0):
- InjectableLoggers (~> 2.0)

DEPENDENCIES:
- InjectableLoggers (~> 2.0)
- Texture
- Texture (~> 3.0)
- Zoomy (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
trunk:
- InjectableLoggers
- PINCache
- PINOperation
Expand All @@ -56,13 +56,13 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
InjectableLoggers: a21d5df992e5c85533a9a5026152e1c8edef7bbe
PINCache: d195fdba255283f7e9900a55e3cced377f431f9b
PINOperation: 24b774353ca248fcf87d67b2d61eef42087c125a
PINRemoteImage: d6d51c5d2adda55f1ce30c96e850b6c4ebd2856a
Texture: 8ecf6984065a1e54f06bf97b349ecca28582acd7
Zoomy: 598d7a6d52567e4f8bf2e557907bbd9d7e725664
InjectableLoggers: 7bc1a68fb12d73785d3d50944a3f1744a8cea868
PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086
PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20
PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01
Texture: 2f109e937850d94d1d07232041c9c7313ccddb81
Zoomy: 79ed8ebc515b980887b9dd5f1ffea4c2df46301e

PODFILE CHECKSUM: 1a98f060c4b54415ee310fe4312ff2c049357790
PODFILE CHECKSUM: 77596a24c95a577618a66ed3d7d1eb864848691e

COCOAPODS: 1.7.5
COCOAPODS: 1.10.1

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

2 changes: 1 addition & 1 deletion Example/Pods/Local Podspecs/Zoomy.podspec.json

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

72 changes: 36 additions & 36 deletions Example/Pods/Manifest.lock

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

4 changes: 2 additions & 2 deletions Example/Pods/PINCache/README.md

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

33 changes: 28 additions & 5 deletions Example/Pods/PINCache/Source/PINCache.h

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

Loading

0 comments on commit fc1bb67

Please sign in to comment.