Skip to content

Commit

Permalink
Merge pull request #98 from BalazsSzamody/Disable-AppKit-on-iOS
Browse files Browse the repository at this point in the history
Resolve issue if need to build swift package for iOS in Xcode 10.2
  • Loading branch information
jegnux authored Oct 3, 2019
2 parents bd13354 + f4878d4 commit d62d313
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
build/
DerivedData

## SPM Generated
*.xcodeproj
*.resolved

## Various settings
*.pbxuser
!default.pbxuser
Expand Down Expand Up @@ -44,6 +48,7 @@ playground.xcworkspace
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
!Example/*.xcodeproj

# Carthage
#
Expand Down
3 changes: 2 additions & 1 deletion Pod/Classes/GestureFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(ObjectiveC)
import RxSwift
import RxCocoa
import ObjectiveC
Expand Down Expand Up @@ -57,3 +57,4 @@ extension Factory where Gesture == GestureRecognizer {
}

private var gestureRecognizerStrongDelegateKey: UInt8 = 0
#endif
3 changes: 2 additions & 1 deletion Pod/Classes/OSX/NSClickGestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(AppKit)
import AppKit
import RxSwift
import RxCocoa
Expand Down Expand Up @@ -88,3 +88,4 @@ extension Reactive where Base: View {
}

}
#endif
3 changes: 2 additions & 1 deletion Pod/Classes/OSX/NSGestureRecognizer+Rx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(AppKit)
import AppKit
import RxSwift
import RxCocoa
Expand Down Expand Up @@ -73,3 +73,4 @@ extension Reactive where Base: NSGestureRecognizer {
}

}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(AppKit)
import AppKit
import RxSwift
import RxCocoa
Expand Down Expand Up @@ -68,3 +68,4 @@ extension ObservableType where E: NSMagnificationGestureRecognizer {
}
}
}
#endif
3 changes: 2 additions & 1 deletion Pod/Classes/OSX/NSPanGestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(AppKit)
import AppKit
import RxSwift
import RxCocoa
Expand Down Expand Up @@ -65,3 +65,4 @@ extension ObservableType where E: NSPanGestureRecognizer {
}
}
}
#endif
3 changes: 2 additions & 1 deletion Pod/Classes/OSX/NSPressGestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(AppKit)
import AppKit
import RxSwift
import RxCocoa
Expand Down Expand Up @@ -47,3 +47,4 @@ extension Reactive where Base: View {
return gesture(make(configuration: configuration))
}
}
#endif
3 changes: 2 additions & 1 deletion Pod/Classes/OSX/NSRotationGestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// 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.

#if canImport(AppKit)
import AppKit
import RxSwift
import RxCocoa
Expand Down Expand Up @@ -59,3 +59,4 @@ extension ObservableType where E: NSRotationGestureRecognizer {
}
}
}
#endif

0 comments on commit d62d313

Please sign in to comment.