Skip to content

Commit

Permalink
Merge branch 'main' of github.com:SnapKit/SnapKit into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	SnapKit.podspec
  • Loading branch information
Robert Payne authored and Robert Payne committed Apr 13, 2022
2 parents eb07a3a + f222cbd commit 07c5d1f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img src="http://snapkit.io/images/banner.jpg" alt="" />
<img src="https://snapkit.github.io/SnapKit/images/banner.jpg" alt="" />

SnapKit is a DSL to make Auto Layout easy on both iOS and OS X.

Expand Down Expand Up @@ -59,7 +59,7 @@ platform :ios, '10.0'
use_frameworks!

target '<Your Target Name>' do
pod 'SnapKit', '~> 5.0.0'
pod 'SnapKit', '~> 5.6.0'
end
```

Expand Down Expand Up @@ -142,8 +142,8 @@ You can try SnapKit in Playground.
### Resources

- [Documentation](http://snapkit.io/docs/)
- [F.A.Q.](http://snapkit.io/faq/)
- [Documentation](https://snapkit.github.io/SnapKit/docs/)
- [F.A.Q.](https://snapkit.github.io/SnapKit/faq/)

## Credits

Expand Down
6 changes: 3 additions & 3 deletions SnapKit.podspec
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Pod::Spec.new do |s|
s.name = 'SnapKit'
s.version = '5.0.1'
s.version = '5.6.0'
s.license = 'MIT'
s.summary = 'Harness the power of auto layout with a simplified, chainable, and compile time safe syntax.'
s.homepage = 'https://github.com/SnapKit/SnapKit'
s.authors = { 'Robert Payne' => '[email protected]' }
s.social_media_url = 'http://twitter.com/robertjpayne'
s.source = { :git => 'https://github.com/SnapKit/SnapKit.git', :tag => '5.0.1' }
s.source = { :git => 'https://github.com/SnapKit/SnapKit.git', :tag => '5.6.0' }

s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.11'
s.tvos.deployment_target = '10.0'

s.source_files = 'Sources/*.swift'

s.swift_version = '5.0'
s.swift_versions = ['5.0']
end
4 changes: 4 additions & 0 deletions SnapKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,8 @@
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1.0.0;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand All @@ -559,6 +561,8 @@
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1.0.0;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand Down

0 comments on commit 07c5d1f

Please sign in to comment.