Permalink
Browse files

Merge branch 'master' of https://github.com/CocoaPods/Specs

* 'master' of https://github.com/CocoaPods/Specs:
  [Update] ObjectiveRecord (1.01)
  revert to commit
  use head instead of commit
  add EKStreamView podspec
  • Loading branch information...
2 parents afee13e + 339bbd9 commit db4f1afb9e079b98bb48484a6b9eacd06105a801 @orta orta committed Aug 26, 2012
Showing with 36 additions and 0 deletions.
  1. +11 −0 EKStreamView/0.0.1/EKStreamView.podspec
  2. +25 −0 ObjectiveRecord/1.01/ObjectiveRecord.podspec
View
11 EKStreamView/0.0.1/EKStreamView.podspec
@@ -0,0 +1,11 @@
+Pod::Spec.new do |s|
+ s.name = "EKStreamView"
+ s.version = "0.0.1"
+ s.summary = "A scrolling view having many cells in different heights and in columns for iOS, just like Pinterest."
+ s.homepage = "https://github.com/ekohe/EKStreamView"
+ s.license = 'Copyright (c) 2012 Eli Wang (sirxenofex@gmail.com)'
+ s.author = { "Ekohe" => "eli@ekohe.com" }
+ s.source = { :git => "https://github.com/ekohe/EKStreamView.git", :commit => '60db6d20ab540f832d391b0f51a0b49d31e0ee22' }
+ s.platform = :ios
+ s.source_files = 'EKStreamView.h', 'EKStreamView.m'
+end
View
25 ObjectiveRecord/1.01/ObjectiveRecord.podspec
@@ -0,0 +1,25 @@
+Pod::Spec.new do |s|
+ s.name = "ObjectiveRecord"
+ s.version = "1.01"
+ s.summary = "Lightweight and sexy Core Data finders, creators and other methods. Rails syntax."
+ s.homepage = "https://github.com/mneorr/Objective-Record"
+ s.license = {
+ :type => 'MIT',
+ :text => <<-LICENSE
+ Copyright (C) 2012 Marin Usalj | @mneorr | mneorr.com
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ LICENSE
+ }
+
+ s.author = { "Marin Usalj" => "mneorr@gmail.com" }
+ s.source = { :git => "https://github.com/mneorr/Objective-Record.git", :tag => "1.01" }
+
+ s.source_files = 'ObjectiveRecord.h', 'src/**/*.{h,m}'
+ s.framework = 'CoreData'
+ s.requires_arc = true
+end

2 comments on commit db4f1af

@fphilipe

Merge branch 'master' of https://github.com/CocoaPods/Specs

Any reason for not doing a rebase? Those kind of commits just pollute history, IMO.

@orta
CocoaPods member

I've always avoided using rebase on public projects with multiple devs, but I'm happy to do so.

Please sign in to comment.