diff --git a/.travis.yml b/.travis.yml index 497efaf..62ebf94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ before_install: - gem install xcpretty -N script: - set -o pipefail -- xcodebuild -project Snap.xcodeproj -scheme "Snap iOS" -sdk iphonesimulator +- xcodebuild -project SnapKit.xcodeproj -scheme "SnapKit iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" ONLY_ACTIVE_ARCH=NO test | xcpretty -c - pod lib lint --quick \ No newline at end of file diff --git a/Assets/snap-banner.png b/Assets/snap-banner.png deleted file mode 100644 index 491b6b5..0000000 Binary files a/Assets/snap-banner.png and /dev/null differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cadb8a..1b98e05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ CHANGELOG ======= -# 0.10.0 - Next Release In Development +# 0.10.0 - April 15 2015 +* **ANNOUNCEMENT**: Snap is now SnapKit * **BREAKING:** The constraint making chain now utilises protocols to tighten the API's to avoid user error. This may break some syntaxes. * **BREAKING:** Semantic `and` and `with` chain variables were removed * Added `update###` functions to `Constraint` so their constants and priorities can be updated -* Added a `Snap.Config.interfaceLayoutDirection` variable for richer Leading/Trailing support. +* Added a `SnapKit.Config.interfaceLayoutDirection` variable for richer Leading/Trailing support. * Fixed memory leaks that could occur on long lived views * Ensure Swift 1.2 compatibility diff --git a/CodeSnippets/Snappy Constraint Make.codesnippet b/CodeSnippets/SnapKit Constraint Make.codesnippet similarity index 94% rename from CodeSnippets/Snappy Constraint Make.codesnippet rename to CodeSnippets/SnapKit Constraint Make.codesnippet index 598f6b3..8272773 100644 --- a/CodeSnippets/Snappy Constraint Make.codesnippet +++ b/CodeSnippets/SnapKit Constraint Make.codesnippet @@ -17,7 +17,7 @@ IDECodeSnippetLanguage Xcode.SourceCodeLanguage.Swift IDECodeSnippetTitle - Snap Constraint Make + SnapKit Constraint Make IDECodeSnippetUserSnippet IDECodeSnippetVersion diff --git a/CodeSnippets/Snappy Constraint Remake.codesnippet b/CodeSnippets/SnapKit Constraint Remake.codesnippet similarity index 94% rename from CodeSnippets/Snappy Constraint Remake.codesnippet rename to CodeSnippets/SnapKit Constraint Remake.codesnippet index 8bdfb9d..5cd1c68 100644 --- a/CodeSnippets/Snappy Constraint Remake.codesnippet +++ b/CodeSnippets/SnapKit Constraint Remake.codesnippet @@ -17,7 +17,7 @@ IDECodeSnippetLanguage Xcode.SourceCodeLanguage.Swift IDECodeSnippetTitle - Snap Constraint Remake + SnapKit Constraint Remake IDECodeSnippetUserSnippet IDECodeSnippetVersion diff --git a/LICENSE b/LICENSE index e334771..a18ccfb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +Copyright (c) 2011-Present SnapKit Team - https://github.com/SnapKit Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b30fd91..b651271 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ - +SnapKit ==== -[![Build Status](https://travis-ci.org/Masonry/Snap.svg)](https://travis-ci.org/Masonry/Snap) +[![Build Status](https://travis-ci.org/SnapKit/SnapKit.svg)](https://travis-ci.org/SnapKit/SnapKit) -Snap is a light-weight layout framework which wraps AutoLayout with a nicer syntax. Snap has its own layout DSL which provides a chainable way of describing your NSLayoutConstraints which results in layout code that is more concise and readable. Snap supports both iOS and OS X. +SnapKit is a light-weight layout framework which wraps AutoLayout with a nicer syntax. SnapKit has its own layout DSL which provides a chainable way of describing your NSLayoutConstraints which results in layout code that is more concise and readable. SnapKit supports both iOS and OS X. -> Snap uses some Swift-only features like function overloading, so it cannot be used from Objective-C. Because of this we’ve chosen to swap prefixes from Masonry’s `mas_` to `snp_` so you can use both Masonry and Snap in the same project. +> SnapKit uses some Swift-only features like function overloading, so it cannot be used from Objective-C. Because of this we’ve chosen to swap prefixes from Masonry’s `mas_` to `snp_` so you can use both Masonry and SnapKit in the same project. ## Requirements @@ -28,14 +28,14 @@ CocoaPods 0.36 adds supports for Swift and embedded frameworks. You can install $ gem install cocoapods ``` -To integrate Snap into your Xcode project using CocoaPods, specify it in your `Podfile`: +To integrate SnapKit into your Xcode project using CocoaPods, specify it in your `Podfile`: ```ruby source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' use_frameworks! -pod 'Snap', '~> 0.9.2' +pod 'SnapKit', '~> 0.10.0' ``` Then, run the following command: @@ -55,30 +55,30 @@ $ brew update $ brew install carthage ``` -To integrate Snap into your Xcode project using Carthage, specify it in your `Cartfile`: +To integrate SnapKit into your Xcode project using Carthage, specify it in your `Cartfile`: ``` -github "Masonry/Snap" >= 0.9.2 +github "SnapKit/SnapKit" >= 0.10.0 ``` ### Manually -If you prefer not to use either of the aforementioned dependency managers, you can integrate Snap into your project manually. +If you prefer not to use either of the aforementioned dependency managers, you can integrate SnapKit into your project manually. ### Embedded Framework -- Add Snap as a [submodule](http://git-scm.com/docs/git-submodule) by opening the Terminal, `cd`-ing into your top-level project directory, and entering the following command: +- Add SnapKit as a [submodule](http://git-scm.com/docs/git-submodule) by opening the Terminal, `cd`-ing into your top-level project directory, and entering the following command: ```bash -$ git submodule add https://github.com/Masonry/Snap.git +$ git submodule add https://github.com/SnapKit/SnapKit.git ``` -- Open the `Snap` folder, and drag `Snap.xcodeproj` into the file navigator of your app project. +- Open the `SnapKit` folder, and drag `SnapKit.xcodeproj` into the file navigator of your app project. - In Xcode, navigate to the target configuration window by clicking on the blue project icon, and selecting the application target under the "Targets" heading in the sidebar. -- Ensure that the deployment target of Snap.framework matches that of the application target. +- Ensure that the deployment target of SnapKit.framework matches that of the application target. - In the tab bar at the top of that window, open the "Build Phases" panel. -- Expand the "Target Dependencies" group, and add `Snap.framework`. -- Click on the `+` button at the top left of the panel and select "New Copy Files Phase". Rename this new phase to "Copy Frameworks", set the "Destination" to "Frameworks", and add `Snap.framework`. +- Expand the "Target Dependencies" group, and add `SnapKit.framework`. +- Click on the `+` button at the top left of the panel and select "New Copy Files Phase". Rename this new phase to "Copy Frameworks", set the "Destination" to "Frameworks", and add `SnapKit.framework`. ## What's wrong with NSLayoutConstraints? @@ -160,9 +160,9 @@ view1.snp_makeConstraints { (make) -> Void in ``` Also note in the first example we had to add the constraints to the superview `superview.addConstraints`. -Snap however will automagically add constraints to the appropriate view. +SnapKit however will automagically add constraints to the appropriate view. -Snap will also call `view1.setTranslatesAutoresizingMaskIntoConstraints(false)` for you. +SnapKit will also call `view1.setTranslatesAutoresizingMaskIntoConstraints(false)` for you. ## Not all things are created equal @@ -214,7 +214,7 @@ make.width.lessThanOrEqualTo(400) ``` However Auto Layout does not allow alignment attributes such as left, right, centerY etc to be set to constant values. -So if you pass a primitive for these attributes Snap will turn these into constraints relative to the view’s superview ie: +So if you pass a primitive for these attributes SnapKit will turn these into constraints relative to the view’s superview ie: ```swift // creates view.left <= view.superview.left + 10 make.left.lessThanOrEqualTo(10) @@ -241,14 +241,14 @@ make.left.equalTo(view).offset(UIEdgeInsetsMake(10, 0, 10, 0)) Priorities are can be tacked on to the end of a constraint chain like so: ```swift -make.left.greaterThanOrEqualTo(label.snp_left).with.priorityLow(); +make.left.greaterThanOrEqualTo(label.snp_left).priorityLow(); -make.top.equalTo(label.snp_top).with.priority(600); +make.top.equalTo(label.snp_top).priority(600); ``` ## Composition, composition, composition -Snap also gives you a few convenience methods which create multiple constraints at the same time. +SnapKit also gives you a few convenience methods which create multiple constraints at the same time. #### edges @@ -285,14 +285,14 @@ You can chain view attributes for increased readability: ```swift // All edges but the top should equal those of the superview -make.left.right.and.bottom.equalTo(superview) +make.left.right.bottom.equalTo(superview) make.top.equalTo(otherView) ``` ## Hold on for dear life Sometimes you need modify existing constraints in order to animate or remove/replace constraints. -In Snap there are a few different approaches to updating constraints. +In SnapKit there are a few different approaches to updating constraints. #### 1. References You can hold on to a reference of a particular constraint by assigning the result of a constraint make expression to a local variable or a class property. @@ -306,8 +306,8 @@ var topConstraint: Constraint? = nil // when making constraints view1.snp_makeConstraints { make in - self.topConstraint = make.top.equalTo(superview).with.offset(padding.top).constraint - make.left.equalTo(superview).with.offset(padding.left) + self.topConstraint = make.top.equalTo(superview).offset(padding.top).constraint + make.left.equalTo(superview).offset(padding.left) } ... @@ -317,7 +317,7 @@ self.topConstraint.uninstall() ### 2. snp_remakeConstraints -`snp_remakeConstraints` is similar to `snp_makeConstraints`, but will first remove all existing constraints installed by Snap. +`snp_remakeConstraints` is similar to `snp_makeConstraints`, but will first remove all existing constraints installed by SnapKit. ```swift func changeButtonPosition() { diff --git a/Snap.xcworkspace/xcshareddata/Snappy.xccheckout b/Snap.xcworkspace/xcshareddata/Snappy.xccheckout deleted file mode 100644 index 91c9f46..0000000 --- a/Snap.xcworkspace/xcshareddata/Snappy.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - FDF6DE8D-A35D-47D4-8CB6-ACB35050F0D0 - IDESourceControlProjectName - Snap - IDESourceControlProjectOriginsDictionary - - 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 - github.com:Masonry/Snap.git - - IDESourceControlProjectPath - Snap.xcodeproj - IDESourceControlProjectRelativeInstallPathDictionary - - 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 - ../.. - - IDESourceControlProjectURL - github.com:Masonry/Snap.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 - IDESourceControlWCCName - Snap - - - - diff --git a/Snap.podspec b/SnapKit.podspec similarity index 68% rename from Snap.podspec rename to SnapKit.podspec index 539643c..d1fb949 100644 --- a/Snap.podspec +++ b/SnapKit.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| - s.name = 'Snap' - s.version = '0.9.2' + s.name = 'SnapKit' + s.version = '0.10.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/Masonry/Snap' + s.homepage = 'https://github.com/SnapKit/SnapKit' s.authors = { 'Robert Payne' => 'robertpayne@me.com' } s.social_media_url = 'http://twitter.com/robertjpayne' - s.source = { :git => 'https://github.com/Masonry/Snap.git', :tag => '0.9.2' } + s.source = { :git => 'https://github.com/SnapKit/SnapKit.git', :tag => '0.10.0' } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' diff --git a/Snap.xcodeproj/project.pbxproj b/SnapKit.xcodeproj/project.pbxproj similarity index 83% rename from Snap.xcodeproj/project.pbxproj rename to SnapKit.xcodeproj/project.pbxproj index a672ccb..cf2823d 100644 --- a/Snap.xcodeproj/project.pbxproj +++ b/SnapKit.xcodeproj/project.pbxproj @@ -9,8 +9,8 @@ /* Begin PBXBuildFile section */ EE94F6091AC0F10A008767FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94F6081AC0F10A008767FF /* UIKit.framework */; }; EE94F60B1AC0F10F008767FF /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94F60A1AC0F10F008767FF /* AppKit.framework */; }; - EE94F6101AC0F143008767FF /* Snap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEBCC9D819CC627D0083B827 /* Snap.framework */; }; - EE94F6111AC0F146008767FF /* Snap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EECDB37A1AC0C9D4006BBC11 /* Snap.framework */; }; + EE94F6101AC0F143008767FF /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEBCC9D819CC627D0083B827 /* SnapKit.framework */; }; + EE94F6111AC0F146008767FF /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EECDB37A1AC0C9D4006BBC11 /* SnapKit.framework */; }; EECDB36C1AC0C9A6006BBC11 /* Constraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35E1AC0C95C006BBC11 /* Constraint.swift */; }; EECDB36D1AC0C9A6006BBC11 /* ConstraintAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35F1AC0C95C006BBC11 /* ConstraintAttributes.swift */; }; EECDB36E1AC0C9A6006BBC11 /* ConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3601AC0C95C006BBC11 /* ConstraintItem.swift */; }; @@ -18,8 +18,8 @@ EECDB3701AC0C9A6006BBC11 /* ConstraintRelation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3621AC0C95C006BBC11 /* ConstraintRelation.swift */; }; EECDB3711AC0C9A6006BBC11 /* EdgeInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3631AC0C95C006BBC11 /* EdgeInsets.swift */; }; EECDB3721AC0C9A6006BBC11 /* LayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3651AC0C95C006BBC11 /* LayoutConstraint.swift */; }; - EECDB3731AC0C9A6006BBC11 /* View+Snap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3671AC0C95C006BBC11 /* View+Snap.swift */; }; - EECDB3741AC0C9B6006BBC11 /* Snap.h in Headers */ = {isa = PBXBuildFile; fileRef = EECDB3661AC0C95C006BBC11 /* Snap.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EECDB3731AC0C9A6006BBC11 /* View+SnapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3671AC0C95C006BBC11 /* View+SnapKit.swift */; }; + EECDB3741AC0C9B6006BBC11 /* SnapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = EECDB3661AC0C95C006BBC11 /* SnapKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; EECDB3931AC0CB52006BBC11 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB36A1AC0C95C006BBC11 /* Tests.swift */; }; EECDB3941AC0CB52006BBC11 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB36A1AC0C95C006BBC11 /* Tests.swift */; }; EECDB3951AC0CBFF006BBC11 /* Constraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35E1AC0C95C006BBC11 /* Constraint.swift */; }; @@ -29,12 +29,12 @@ EECDB3991AC0CBFF006BBC11 /* ConstraintRelation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3621AC0C95C006BBC11 /* ConstraintRelation.swift */; }; EECDB39A1AC0CBFF006BBC11 /* EdgeInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3631AC0C95C006BBC11 /* EdgeInsets.swift */; }; EECDB39B1AC0CBFF006BBC11 /* LayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3651AC0C95C006BBC11 /* LayoutConstraint.swift */; }; - EECDB39C1AC0CBFF006BBC11 /* View+Snap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3671AC0C95C006BBC11 /* View+Snap.swift */; }; - EECDB39D1AC0CC03006BBC11 /* Snap.h in Headers */ = {isa = PBXBuildFile; fileRef = EECDB3661AC0C95C006BBC11 /* Snap.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EECDB39C1AC0CBFF006BBC11 /* View+SnapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB3671AC0C95C006BBC11 /* View+SnapKit.swift */; }; + EECDB39D1AC0CC03006BBC11 /* SnapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = EECDB3661AC0C95C006BBC11 /* SnapKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; EEFCF32C1AD910B900A425FA /* Debugging.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF32B1AD910B900A425FA /* Debugging.swift */; }; EEFCF32D1AD9250C00A425FA /* Debugging.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF32B1AD910B900A425FA /* Debugging.swift */; }; - EEFCF32F1AD926AE00A425FA /* Snap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF32E1AD926AE00A425FA /* Snap.swift */; }; - EEFCF3301AD92C2200A425FA /* Snap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF32E1AD926AE00A425FA /* Snap.swift */; }; + EEFCF32F1AD926AE00A425FA /* SnapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF32E1AD926AE00A425FA /* SnapKit.swift */; }; + EEFCF3301AD92C2200A425FA /* SnapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF32E1AD926AE00A425FA /* SnapKit.swift */; }; EEFCF3321AD9432400A425FA /* ConstraintDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF3311AD9432400A425FA /* ConstraintDescription.swift */; }; EEFCF3331AD9432400A425FA /* ConstraintDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFCF3311AD9432400A425FA /* ConstraintDescription.swift */; }; /* End PBXBuildFile section */ @@ -45,15 +45,15 @@ containerPortal = DDC9FD8D1981B4DD009612C7 /* Project object */; proxyType = 1; remoteGlobalIDString = EECDB3791AC0C9D4006BBC11; - remoteInfo = "Snap OSX"; + remoteInfo = "SnapKit OSX"; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ EE94F6081AC0F10A008767FF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; EE94F60A1AC0F10F008767FF /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; - EEBCC9D819CC627D0083B827 /* Snap.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Snap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EEBCC9E219CC627E0083B827 /* Snap iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Snap iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + EEBCC9D819CC627D0083B827 /* SnapKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EEBCC9E219CC627E0083B827 /* SnapKit iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SnapKit iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; EECDB35E1AC0C95C006BBC11 /* Constraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constraint.swift; sourceTree = ""; }; EECDB35F1AC0C95C006BBC11 /* ConstraintAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstraintAttributes.swift; sourceTree = ""; }; EECDB3601AC0C95C006BBC11 /* ConstraintItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstraintItem.swift; sourceTree = ""; }; @@ -62,14 +62,14 @@ EECDB3631AC0C95C006BBC11 /* EdgeInsets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeInsets.swift; sourceTree = ""; }; EECDB3641AC0C95C006BBC11 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EECDB3651AC0C95C006BBC11 /* LayoutConstraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutConstraint.swift; sourceTree = ""; }; - EECDB3661AC0C95C006BBC11 /* Snap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Snap.h; sourceTree = ""; }; - EECDB3671AC0C95C006BBC11 /* View+Snap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Snap.swift"; sourceTree = ""; }; + EECDB3661AC0C95C006BBC11 /* SnapKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnapKit.h; sourceTree = ""; }; + EECDB3671AC0C95C006BBC11 /* View+SnapKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+SnapKit.swift"; sourceTree = ""; }; EECDB3691AC0C95C006BBC11 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EECDB36A1AC0C95C006BBC11 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = ""; }; - EECDB37A1AC0C9D4006BBC11 /* Snap.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Snap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EECDB3841AC0C9D4006BBC11 /* Snap OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Snap OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + EECDB37A1AC0C9D4006BBC11 /* SnapKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EECDB3841AC0C9D4006BBC11 /* SnapKit OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SnapKit OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; EEFCF32B1AD910B900A425FA /* Debugging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Debugging.swift; sourceTree = ""; }; - EEFCF32E1AD926AE00A425FA /* Snap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Snap.swift; sourceTree = ""; }; + EEFCF32E1AD926AE00A425FA /* SnapKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnapKit.swift; sourceTree = ""; }; EEFCF3311AD9432400A425FA /* ConstraintDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintDescription.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -78,7 +78,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EE94F6111AC0F146008767FF /* Snap.framework in Frameworks */, + EE94F6111AC0F146008767FF /* SnapKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -86,7 +86,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EE94F6101AC0F143008767FF /* Snap.framework in Frameworks */, + EE94F6101AC0F143008767FF /* SnapKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -121,10 +121,10 @@ DDC9FD961981B4DD009612C7 /* Products */ = { isa = PBXGroup; children = ( - EEBCC9D819CC627D0083B827 /* Snap.framework */, - EEBCC9E219CC627E0083B827 /* Snap iOS Tests.xctest */, - EECDB37A1AC0C9D4006BBC11 /* Snap.framework */, - EECDB3841AC0C9D4006BBC11 /* Snap OSX Tests.xctest */, + EEBCC9D819CC627D0083B827 /* SnapKit.framework */, + EEBCC9E219CC627E0083B827 /* SnapKit iOS Tests.xctest */, + EECDB37A1AC0C9D4006BBC11 /* SnapKit.framework */, + EECDB3841AC0C9D4006BBC11 /* SnapKit OSX Tests.xctest */, ); name = Products; sourceTree = ""; @@ -141,12 +141,12 @@ EECDB35D1AC0C95C006BBC11 /* Source */ = { isa = PBXGroup; children = ( - EECDB3661AC0C95C006BBC11 /* Snap.h */, - EEFCF32E1AD926AE00A425FA /* Snap.swift */, + EECDB3661AC0C95C006BBC11 /* SnapKit.h */, + EEFCF32E1AD926AE00A425FA /* SnapKit.swift */, EECDB35E1AC0C95C006BBC11 /* Constraint.swift */, EEFCF3311AD9432400A425FA /* ConstraintDescription.swift */, EECDB3611AC0C95C006BBC11 /* ConstraintMaker.swift */, - EECDB3671AC0C95C006BBC11 /* View+Snap.swift */, + EECDB3671AC0C95C006BBC11 /* View+SnapKit.swift */, EECDB3601AC0C95C006BBC11 /* ConstraintItem.swift */, EECDB3631AC0C95C006BBC11 /* EdgeInsets.swift */, EECDB3651AC0C95C006BBC11 /* LayoutConstraint.swift */, @@ -184,7 +184,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - EECDB3741AC0C9B6006BBC11 /* Snap.h in Headers */, + EECDB3741AC0C9B6006BBC11 /* SnapKit.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -192,16 +192,16 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - EECDB39D1AC0CC03006BBC11 /* Snap.h in Headers */, + EECDB39D1AC0CC03006BBC11 /* SnapKit.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - EEBCC9D719CC627D0083B827 /* Snap iOS */ = { + EEBCC9D719CC627D0083B827 /* SnapKit iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snap iOS" */; + buildConfigurationList = EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnapKit iOS" */; buildPhases = ( EEBCC9D319CC627D0083B827 /* Sources */, EEBCC9D419CC627D0083B827 /* Frameworks */, @@ -212,14 +212,14 @@ ); dependencies = ( ); - name = "Snap iOS"; - productName = Snap; - productReference = EEBCC9D819CC627D0083B827 /* Snap.framework */; + name = "SnapKit iOS"; + productName = SnapKit; + productReference = EEBCC9D819CC627D0083B827 /* SnapKit.framework */; productType = "com.apple.product-type.framework"; }; - EEBCC9E119CC627D0083B827 /* Snap iOS Tests */ = { + EEBCC9E119CC627D0083B827 /* SnapKit iOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snap iOS Tests" */; + buildConfigurationList = EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnapKit iOS Tests" */; buildPhases = ( EEBCC9DE19CC627D0083B827 /* Sources */, EE94F60E1AC0F136008767FF /* Frameworks */, @@ -229,14 +229,14 @@ ); dependencies = ( ); - name = "Snap iOS Tests"; - productName = SnapTests; - productReference = EEBCC9E219CC627E0083B827 /* Snap iOS Tests.xctest */; + name = "SnapKit iOS Tests"; + productName = SnapKitTests; + productReference = EEBCC9E219CC627E0083B827 /* SnapKit iOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - EECDB3791AC0C9D4006BBC11 /* Snap OSX */ = { + EECDB3791AC0C9D4006BBC11 /* SnapKit OSX */ = { isa = PBXNativeTarget; - buildConfigurationList = EECDB38D1AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "Snap OSX" */; + buildConfigurationList = EECDB38D1AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "SnapKit OSX" */; buildPhases = ( EECDB3751AC0C9D4006BBC11 /* Sources */, EECDB3761AC0C9D4006BBC11 /* Frameworks */, @@ -247,14 +247,14 @@ ); dependencies = ( ); - name = "Snap OSX"; - productName = "Snap OSX"; - productReference = EECDB37A1AC0C9D4006BBC11 /* Snap.framework */; + name = "SnapKit OSX"; + productName = "SnapKit OSX"; + productReference = EECDB37A1AC0C9D4006BBC11 /* SnapKit.framework */; productType = "com.apple.product-type.framework"; }; - EECDB3831AC0C9D4006BBC11 /* Snap OSX Tests */ = { + EECDB3831AC0C9D4006BBC11 /* SnapKit OSX Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = EECDB3901AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "Snap OSX Tests" */; + buildConfigurationList = EECDB3901AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "SnapKit OSX Tests" */; buildPhases = ( EECDB3801AC0C9D4006BBC11 /* Sources */, EE94F60D1AC0F132008767FF /* Frameworks */, @@ -265,9 +265,9 @@ dependencies = ( EECDB3871AC0C9D4006BBC11 /* PBXTargetDependency */, ); - name = "Snap OSX Tests"; - productName = "Snap OSXTests"; - productReference = EECDB3841AC0C9D4006BBC11 /* Snap OSX Tests.xctest */; + name = "SnapKit OSX Tests"; + productName = "SnapKit OSXTests"; + productReference = EECDB3841AC0C9D4006BBC11 /* SnapKit OSX Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -277,7 +277,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0600; - ORGANIZATIONNAME = "Masonry Team"; + ORGANIZATIONNAME = "SnapKit Team"; TargetAttributes = { EEBCC9D719CC627D0083B827 = { CreatedOnToolsVersion = 6.0; @@ -293,7 +293,7 @@ }; }; }; - buildConfigurationList = DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "Snap" */; + buildConfigurationList = DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "SnapKit" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -306,10 +306,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( - EEBCC9D719CC627D0083B827 /* Snap iOS */, - EECDB3791AC0C9D4006BBC11 /* Snap OSX */, - EEBCC9E119CC627D0083B827 /* Snap iOS Tests */, - EECDB3831AC0C9D4006BBC11 /* Snap OSX Tests */, + EEBCC9D719CC627D0083B827 /* SnapKit iOS */, + EECDB3791AC0C9D4006BBC11 /* SnapKit OSX */, + EEBCC9E119CC627D0083B827 /* SnapKit iOS Tests */, + EECDB3831AC0C9D4006BBC11 /* SnapKit OSX Tests */, ); }; /* End PBXProject section */ @@ -351,11 +351,11 @@ buildActionMask = 2147483647; files = ( EECDB36C1AC0C9A6006BBC11 /* Constraint.swift in Sources */, - EEFCF32F1AD926AE00A425FA /* Snap.swift in Sources */, + EEFCF32F1AD926AE00A425FA /* SnapKit.swift in Sources */, EEFCF32C1AD910B900A425FA /* Debugging.swift in Sources */, EECDB3701AC0C9A6006BBC11 /* ConstraintRelation.swift in Sources */, EEFCF3321AD9432400A425FA /* ConstraintDescription.swift in Sources */, - EECDB3731AC0C9A6006BBC11 /* View+Snap.swift in Sources */, + EECDB3731AC0C9A6006BBC11 /* View+SnapKit.swift in Sources */, EECDB3711AC0C9A6006BBC11 /* EdgeInsets.swift in Sources */, EECDB36F1AC0C9A6006BBC11 /* ConstraintMaker.swift in Sources */, EECDB36D1AC0C9A6006BBC11 /* ConstraintAttributes.swift in Sources */, @@ -377,11 +377,11 @@ buildActionMask = 2147483647; files = ( EECDB3951AC0CBFF006BBC11 /* Constraint.swift in Sources */, - EEFCF3301AD92C2200A425FA /* Snap.swift in Sources */, + EEFCF3301AD92C2200A425FA /* SnapKit.swift in Sources */, EEFCF32D1AD9250C00A425FA /* Debugging.swift in Sources */, EECDB3991AC0CBFF006BBC11 /* ConstraintRelation.swift in Sources */, EEFCF3331AD9432400A425FA /* ConstraintDescription.swift in Sources */, - EECDB39C1AC0CBFF006BBC11 /* View+Snap.swift in Sources */, + EECDB39C1AC0CBFF006BBC11 /* View+SnapKit.swift in Sources */, EECDB39A1AC0CBFF006BBC11 /* EdgeInsets.swift in Sources */, EECDB3981AC0CBFF006BBC11 /* ConstraintMaker.swift in Sources */, EECDB3961AC0CBFF006BBC11 /* ConstraintAttributes.swift in Sources */, @@ -403,7 +403,7 @@ /* Begin PBXTargetDependency section */ EECDB3871AC0C9D4006BBC11 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = EECDB3791AC0C9D4006BBC11 /* Snap OSX */; + target = EECDB3791AC0C9D4006BBC11 /* SnapKit OSX */; targetProxy = EECDB3861AC0C9D4006BBC11 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -502,7 +502,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = Snap; + PRODUCT_NAME = SnapKit; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; VERSIONING_SYSTEM = "apple-generic"; @@ -522,7 +522,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = Snap; + PRODUCT_NAME = SnapKit; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; VERSIONING_SYSTEM = "apple-generic"; @@ -574,7 +574,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_NAME = Snap; + PRODUCT_NAME = SnapKit; SDKROOT = macosx; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = macosx; @@ -598,7 +598,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_NAME = Snap; + PRODUCT_NAME = SnapKit; SDKROOT = macosx; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = macosx; @@ -644,7 +644,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "Snap" */ = { + DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "SnapKit" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC9FDAF1981B4DD009612C7 /* Debug */, @@ -653,7 +653,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snap iOS" */ = { + EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnapKit iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( EEBCC9E919CC627E0083B827 /* Debug */, @@ -662,7 +662,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snap iOS Tests" */ = { + EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnapKit iOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( EEBCC9EC19CC627E0083B827 /* Debug */, @@ -671,7 +671,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EECDB38D1AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "Snap OSX" */ = { + EECDB38D1AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "SnapKit OSX" */ = { isa = XCConfigurationList; buildConfigurations = ( EECDB38E1AC0C9D4006BBC11 /* Debug */, @@ -680,7 +680,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EECDB3901AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "Snap OSX Tests" */ = { + EECDB3901AC0C9D4006BBC11 /* Build configuration list for PBXNativeTarget "SnapKit OSX Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( EECDB3911AC0C9D4006BBC11 /* Debug */, diff --git a/Snap.xcodeproj/xcshareddata/xcschemes/Snap OSX.xcscheme b/SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit OSX.xcscheme similarity index 76% rename from Snap.xcodeproj/xcshareddata/xcschemes/Snap OSX.xcscheme rename to SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit OSX.xcscheme index cf8990d..a6be18a 100644 --- a/Snap.xcodeproj/xcshareddata/xcschemes/Snap OSX.xcscheme +++ b/SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit OSX.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit OSX" + ReferencedContainer = "container:SnapKit.xcodeproj"> + BuildableName = "SnapKit OSX Tests.xctest" + BlueprintName = "SnapKit OSX Tests" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "SnapKit OSX Tests.xctest" + BlueprintName = "SnapKit OSX Tests" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -57,9 +57,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit OSX" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -76,9 +76,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit OSX" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -94,9 +94,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit OSX" + ReferencedContainer = "container:SnapKit.xcodeproj"> diff --git a/Snap.xcodeproj/xcshareddata/xcschemes/Snap iOS.xcscheme b/SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit iOS.xcscheme similarity index 76% rename from Snap.xcodeproj/xcshareddata/xcschemes/Snap iOS.xcscheme rename to SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit iOS.xcscheme index f33a6f1..029b88e 100644 --- a/Snap.xcodeproj/xcshareddata/xcschemes/Snap iOS.xcscheme +++ b/SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit iOS" + ReferencedContainer = "container:SnapKit.xcodeproj"> + BuildableName = "SnapKit iOS Tests.xctest" + BlueprintName = "SnapKit iOS Tests" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "SnapKit iOS Tests.xctest" + BlueprintName = "SnapKit iOS Tests" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -57,9 +57,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit iOS" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -76,9 +76,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit iOS" + ReferencedContainer = "container:SnapKit.xcodeproj"> @@ -94,9 +94,9 @@ + BuildableName = "SnapKit.framework" + BlueprintName = "SnapKit iOS" + ReferencedContainer = "container:SnapKit.xcodeproj"> diff --git a/Snap.xcworkspace/contents.xcworkspacedata b/SnapKit.xcworkspace/contents.xcworkspacedata similarity index 69% rename from Snap.xcworkspace/contents.xcworkspacedata rename to SnapKit.xcworkspace/contents.xcworkspacedata index 8ae6f15..6814365 100644 --- a/Snap.xcworkspace/contents.xcworkspacedata +++ b/SnapKit.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "container:SnapKit.xcodeproj"> diff --git a/Snap.xcworkspace/xcshareddata/Snap.xccheckout b/SnapKit.xcworkspace/xcshareddata/SnapKit.xccheckout similarity index 89% rename from Snap.xcworkspace/xcshareddata/Snap.xccheckout rename to SnapKit.xcworkspace/xcshareddata/SnapKit.xccheckout index 19c212e..ffcc9ed 100644 --- a/Snap.xcworkspace/xcshareddata/Snap.xccheckout +++ b/SnapKit.xcworkspace/xcshareddata/SnapKit.xccheckout @@ -5,16 +5,16 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - A81B1AD2-2D5B-4BB2-AAA6-86A53AADC474 + A9120727-7306-4189-ADAA-9CB826A3713C IDESourceControlProjectName - Snap + SnapKit IDESourceControlProjectOriginsDictionary 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 github.com:Masonry/Snap.git IDESourceControlProjectPath - Snap.xcworkspace + SnapKit.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 @@ -34,7 +34,7 @@ IDESourceControlWCCIdentifierKey 3AF18F9C6F5D633BAA0B3F935459E0C777C82047 IDESourceControlWCCName - Snap + SnapKit diff --git a/Source/Constraint.swift b/Source/Constraint.swift index e3aefd4..1f81806 100644 --- a/Source/Constraint.swift +++ b/Source/Constraint.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-Present SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/ConstraintAttributes.swift b/Source/ConstraintAttributes.swift index 25dd209..d20cd95 100644 --- a/Source/ConstraintAttributes.swift +++ b/Source/ConstraintAttributes.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/ConstraintDescription.swift b/Source/ConstraintDescription.swift index 0ab8c4b..939b57d 100644 --- a/Source/ConstraintDescription.swift +++ b/Source/ConstraintDescription.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/ConstraintItem.swift b/Source/ConstraintItem.swift index 3b99b55..9cab2bf 100644 --- a/Source/ConstraintItem.swift +++ b/Source/ConstraintItem.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/ConstraintMaker.swift b/Source/ConstraintMaker.swift index bc19cd1..8ab1e07 100644 --- a/Source/ConstraintMaker.swift +++ b/Source/ConstraintMaker.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/ConstraintRelation.swift b/Source/ConstraintRelation.swift index 57cb3f9..0475e02 100644 --- a/Source/ConstraintRelation.swift +++ b/Source/ConstraintRelation.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/Debugging.swift b/Source/Debugging.swift index 9449afb..8a96a74 100644 --- a/Source/Debugging.swift +++ b/Source/Debugging.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/EdgeInsets.swift b/Source/EdgeInsets.swift index 301838a..d6003aa 100644 --- a/Source/EdgeInsets.swift +++ b/Source/EdgeInsets.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/Info.plist b/Source/Info.plist index 7613312..9659480 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.masonry.$(PRODUCT_NAME:rfc1034identifier) + io.snapkit.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Source/LayoutConstraint.swift b/Source/LayoutConstraint.swift index dad99ff..835fba3 100644 --- a/Source/LayoutConstraint.swift +++ b/Source/LayoutConstraint.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/Snap.h b/Source/SnapKit.h similarity index 85% rename from Source/Snap.h rename to Source/SnapKit.h index 0b37559..12075c8 100644 --- a/Source/Snap.h +++ b/Source/SnapKit.h @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-Present SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -23,5 +23,5 @@ #import -FOUNDATION_EXPORT double SnapVersionNumber; -FOUNDATION_EXPORT const unsigned char SnapVersionString[]; \ No newline at end of file +FOUNDATION_EXPORT double SnapKitVersionNumber; +FOUNDATION_EXPORT const unsigned char SnapKitVersionString[]; \ No newline at end of file diff --git a/Source/Snap.swift b/Source/SnapKit.swift similarity index 91% rename from Source/Snap.swift rename to Source/SnapKit.swift index ad9d1e7..cf573dc 100644 --- a/Source/Snap.swift +++ b/Source/SnapKit.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -30,7 +30,7 @@ public typealias InterfaceLayoutDirection = NSUserInterfaceLayoutDirection #endif /** - Used to configure different parts of Snap + Used to configure different parts of SnapKit */ public struct Config { diff --git a/Source/View+Snap.swift b/Source/View+SnapKit.swift similarity index 98% rename from Source/View+Snap.swift rename to Source/View+SnapKit.swift index 44f452d..a6c297c 100644 --- a/Source/View+Snap.swift +++ b/Source/View+SnapKit.swift @@ -1,7 +1,7 @@ // -// Snap +// SnapKit // -// Copyright (c) 2011-2015 Masonry Team - https://github.com/Masonry +// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Tests/Info.plist b/Tests/Info.plist index 1235593..e06ec80 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.masonry.$(PRODUCT_NAME:rfc1034identifier) + io.snapkit.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Tests/Tests.swift b/Tests/Tests.swift index cb2315e..d408fe0 100644 --- a/Tests/Tests.swift +++ b/Tests/Tests.swift @@ -13,9 +13,9 @@ extension View { #endif import XCTest -import Snap +import SnapKit -class SnapTests: XCTestCase { +class SnapKitTests: XCTestCase { let container = View()