Skip to content

Commit

Permalink
Merge pull request #5 from icanzilb/master
Browse files Browse the repository at this point in the history
* 0.1.5 change copyright and ownership
  • Loading branch information
icanzilb committed Mar 25, 2016
2 parents f844206 + 4759fea commit 61e7d4a
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016 Marin Todorov <[email protected]>
Copyright (c) RxSwiftCommunity

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 4 additions & 1 deletion Pod/Classes/OSX/NSGestureRecognizer+Rx.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2016 Marin Todorov http://www.underplot.com
// Copyright (c) RxSwiftCommunity

// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -40,6 +40,9 @@ private class GestureTarget {
var handler: (()->Void)?
}

//
// TODO: Make a PR to RxCocoa to add rx_event to NSGestureRecognizer and remove this file from this repo
//
extension NSGestureRecognizer {

/**
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/OSX/NSView+RxGesture.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2016 Marin Todorov http://www.underplot.com
// Copyright (c) RxSwiftCommunity

// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/RxGesture.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2016 Marin Todorov http://www.underplot.com
// Copyright (c) RxSwiftCommunity

// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/iOS/UIView+RxGesture.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2016 Marin Todorov http://www.underplot.com
// Copyright (c) RxSwiftCommunity

// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ pod "RxGesture"
- defo add tests
- make pr to rxcocoa to add native support for rx_event to `NSGestureRecognizer` and remove the implementation from this repo

## Author
## Thanks

Marin Todorov, [www.underplot.com](http://www.underplot.com)
Everyone in the RxSwift Slack channel 💯

## License

Expand Down
6 changes: 3 additions & 3 deletions RxGesture.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Pod::Spec.new do |s|
s.name = "RxGesture"
s.version = "0.1.4"
s.version = "0.1.5"
s.summary = "RxSwfit reactive wrapper for view gestures."

s.description = <<-DESC
Expand All @@ -14,10 +14,10 @@ Pod::Spec.new do |s|
combine taps, presses, or swipes in any direction
DESC

s.homepage = "https://github.com/icanzilb/RxGesture"
s.homepage = "https://github.com/RxSwiftCommunity/RxGesture"
s.license = 'MIT'
s.author = { "Marin Todorov" => "[email protected]" }
s.source = { :git => "https://github.com/icanzilb/RxGesture.git", :tag => s.version.to_s }
s.source = { :git => "https://github.com/RxSwiftCommunity/RxGesture.git", :tag => s.version.to_s }

s.requires_arc = true

Expand Down

0 comments on commit 61e7d4a

Please sign in to comment.