Merge branch 'develop'

markohlebar · Jan 22, 2015 · 937dc41 · 937dc41
2 parents 82a32ef + a48507f
commit 937dc41
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 132 deletions.
diff --git a/BIND.podspec b/BIND.podspec
@@ -20,6 +20,9 @@ Data Binding and MVVM for iOS.
 
   s.source       = { :git => "https://github.com/markohlebar/BIND.git", :tag => "1.0.3" }
   s.source_files  = "BIND", "BIND/**/*.{h,m}"
+  s.ios.exclude_files = "BIND/Categories/OSX/**/*.{h,m}"
+  s.osx.exclude_files = "BIND/Categories/iOS/**/*.{h,m}"
+
   # s.public_header_files = "Classes/**/*.h"
   s.prefix_header_file = 'BIND-PrefixHeader.pch'
   s.requires_arc = true

diff --git a/BIND.xcodeproj/project.pbxproj b/BIND.xcodeproj/project.pbxproj
diff --git a/BIND/Categories/NSTableView+BNDBinding.h → BIND/Categories/OSX/NSTableView+BNDBinding.h b/BIND/Categories/NSTableView+BNDBinding.h → BIND/Categories/OSX/NSTableView+BNDBinding.h
diff --git a/BIND/Categories/NSTableView+BNDBinding.m → BIND/Categories/OSX/NSTableView+BNDBinding.m b/BIND/Categories/NSTableView+BNDBinding.m → BIND/Categories/OSX/NSTableView+BNDBinding.m
diff --git a/BIND/Categories/NSTextField+BNDBinding.h → BIND/Categories/OSX/NSTextField+BNDBinding.h b/BIND/Categories/NSTextField+BNDBinding.h → BIND/Categories/OSX/NSTextField+BNDBinding.h
diff --git a/BIND/Categories/NSTextField+BNDBinding.m → BIND/Categories/OSX/NSTextField+BNDBinding.m b/BIND/Categories/NSTextField+BNDBinding.m → BIND/Categories/OSX/NSTextField+BNDBinding.m
diff --git a/BIND/Categories/UIButton+BNDBinding.h → BIND/Categories/iOS/UIButton+BNDBinding.h b/BIND/Categories/UIButton+BNDBinding.h → BIND/Categories/iOS/UIButton+BNDBinding.h
diff --git a/BIND/Categories/UIButton+BNDBinding.m → BIND/Categories/iOS/UIButton+BNDBinding.m b/BIND/Categories/UIButton+BNDBinding.m → BIND/Categories/iOS/UIButton+BNDBinding.m
diff --git a/BIND/Classes/BNDSpecialKeyPathHandler.h b/BIND/Classes/BNDSpecialKeyPathHandler.h
diff --git a/BIND/Classes/BNDSpecialKeyPathHandler.m b/BIND/Classes/BNDSpecialKeyPathHandler.m