diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/Observable-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Observable-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 4df54a3..0000000 --- a/Observable-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Observable-Swift.podspec.json b/Observables-Swift.podspec.json old mode 100644 new mode 100755 similarity index 72% rename from Observable-Swift.podspec.json rename to Observables-Swift.podspec.json index 2936c64..2211ce6 --- a/Observable-Swift.podspec.json +++ b/Observables-Swift.podspec.json @@ -1,7 +1,7 @@ { - "name" : "Observable-Swift", - "module_name" : "Observable", - "version" : "0.7.0", + "name" : "Observables-Swift", + "module_name" : "Observables", + "version" : "0.7.2", "license" : "MIT", "platforms" : { "ios" : "8.0", @@ -13,8 +13,8 @@ "summary" : "KVO for Swift - Value Observing and Events", "source" : { "git" : "https://github.com/slazyk/Observable-Swift.git", - "tag" : "v0.7.0" + "tag" : "v0.7.2" }, - "source_files" : "Observable-Swift/*.swift", + "source_files" : "Observables-Swift/*.swift", "requires_arc" : true } diff --git a/Observable-Swift.xcodeproj/project.pbxproj b/Observables-Swift.xcodeproj/project.pbxproj similarity index 93% rename from Observable-Swift.xcodeproj/project.pbxproj rename to Observables-Swift.xcodeproj/project.pbxproj index a1aa692..4d32a6d 100644 --- a/Observable-Swift.xcodeproj/project.pbxproj +++ b/Observables-Swift.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 1C93C1351AB0F65D0004FCEF /* Observable-Swift.podspec.json in Resources */ = {isa = PBXBuildFile; fileRef = 1C93C1341AB0F65D0004FCEF /* Observable-Swift.podspec.json */; }; + 1C93C1351AB0F65D0004FCEF /* Observables-Swift.podspec.json in Resources */ = {isa = PBXBuildFile; fileRef = 1C93C1341AB0F65D0004FCEF /* Observables-Swift.podspec.json */; }; 65263AA31954BC5000B39269 /* Observable.h in Headers */ = {isa = PBXBuildFile; fileRef = 65263AA21954BC5000B39269 /* Observable.h */; settings = {ATTRIBUTES = (Public, ); }; }; 65263AB01954BC5000B39269 /* ObservableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65263AAF1954BC5000B39269 /* ObservableTests.swift */; }; 65263ABA1954BC9F00B39269 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65263AB91954BC9F00B39269 /* Observable.swift */; }; @@ -125,8 +125,8 @@ 1C35F8351CA6FE630073DDE4 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = ""; }; 1C35F8361CA6FE630073DDE4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; 1C35F8371CA6FE630073DDE4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 1C93C1341AB0F65D0004FCEF /* Observable-Swift.podspec.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Observable-Swift.podspec.json"; sourceTree = ""; }; - 65263A9D1954BC5000B39269 /* Observable.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Observable.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1C93C1341AB0F65D0004FCEF /* Observables-Swift.podspec.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Observables-Swift.podspec.json"; sourceTree = ""; }; + 65263A9D1954BC5000B39269 /* Observables.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Observables.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 65263AA11954BC5000B39269 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 65263AA21954BC5000B39269 /* Observable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Observable.h; sourceTree = ""; }; 65263AA81954BC5000B39269 /* Observable Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Observable Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -138,7 +138,7 @@ 65263AC31955004A00B39269 /* ObservableReference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObservableReference.swift; sourceTree = ""; }; 65263AC51955D7AE00B39269 /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = ""; }; 65263AC71955D83200B39269 /* EventSubscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventSubscription.swift; sourceTree = ""; }; - 6592C2FC1957532100BA8CB7 /* Observable.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Observable.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6592C2FC1957532100BA8CB7 /* Observables.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Observables.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6592C3061957532100BA8CB7 /* Observable-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Observable-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 65A18B941958C180008E0B44 /* EventReference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventReference.swift; sourceTree = ""; }; 65D53669195F711E003B5DA5 /* OwningEventReference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OwningEventReference.swift; sourceTree = ""; }; @@ -184,9 +184,9 @@ 1C35F8361CA6FE630073DDE4 /* LICENSE */, 1C35F8351CA6FE630073DDE4 /* CHANGELOG.md */, 1C35F8371CA6FE630073DDE4 /* README.md */, - 1C93C1341AB0F65D0004FCEF /* Observable-Swift.podspec.json */, - 65263A9F1954BC5000B39269 /* Observable */, - 65263AAC1954BC5000B39269 /* ObservableTests */, + 1C93C1341AB0F65D0004FCEF /* Observables-Swift.podspec.json */, + 65263A9F1954BC5000B39269 /* Observables */, + 65263AAC1954BC5000B39269 /* ObservablesTests */, 65263A9E1954BC5000B39269 /* Products */, ); sourceTree = ""; @@ -194,15 +194,15 @@ 65263A9E1954BC5000B39269 /* Products */ = { isa = PBXGroup; children = ( - 65263A9D1954BC5000B39269 /* Observable.framework */, + 65263A9D1954BC5000B39269 /* Observables.framework */, 65263AA81954BC5000B39269 /* Observable Tests.xctest */, - 6592C2FC1957532100BA8CB7 /* Observable.framework */, + 6592C2FC1957532100BA8CB7 /* Observables.framework */, 6592C3061957532100BA8CB7 /* Observable-iOS Tests.xctest */, ); name = Products; sourceTree = ""; }; - 65263A9F1954BC5000B39269 /* Observable */ = { + 65263A9F1954BC5000B39269 /* Observables */ = { isa = PBXGroup; children = ( 65263AC11954EBD600B39269 /* Protocols.swift */, @@ -218,8 +218,8 @@ 65263AA21954BC5000B39269 /* Observable.h */, 65263AA01954BC5000B39269 /* Supporting Files */, ); - name = Observable; - path = "Observable-Swift"; + name = Observables; + path = "Observables-Swift"; sourceTree = ""; }; 65263AA01954BC5000B39269 /* Supporting Files */ = { @@ -230,14 +230,14 @@ name = "Supporting Files"; sourceTree = ""; }; - 65263AAC1954BC5000B39269 /* ObservableTests */ = { + 65263AAC1954BC5000B39269 /* ObservablesTests */ = { isa = PBXGroup; children = ( 65263AAF1954BC5000B39269 /* ObservableTests.swift */, 65263AAD1954BC5000B39269 /* Supporting Files */, ); - name = ObservableTests; - path = "Observable-SwiftTests"; + name = ObservablesTests; + path = "Observables-SwiftTests"; sourceTree = ""; }; 65263AAD1954BC5000B39269 /* Supporting Files */ = { @@ -284,8 +284,8 @@ dependencies = ( ); name = Observable; - productName = "Observable-Swift"; - productReference = 65263A9D1954BC5000B39269 /* Observable.framework */; + productName = "Observables-Swift"; + productReference = 65263A9D1954BC5000B39269 /* Observables.framework */; productType = "com.apple.product-type.framework"; }; 65263AA71954BC5000B39269 /* Observable Tests */ = { @@ -306,7 +306,7 @@ 65E7DC681957878C00CFB99C /* PBXTargetDependency */, ); name = "Observable Tests"; - productName = "Observable-SwiftTests"; + productName = "Observables-SwiftTests"; productReference = 65263AA81954BC5000B39269 /* Observable Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; @@ -325,7 +325,7 @@ ); name = "Observable-iOS"; productName = "Observable-iOS"; - productReference = 6592C2FC1957532100BA8CB7 /* Observable.framework */; + productReference = 6592C2FC1957532100BA8CB7 /* Observables.framework */; productType = "com.apple.product-type.framework"; }; 6592C3051957532100BA8CB7 /* Observable-iOS Tests */ = { @@ -382,11 +382,12 @@ }; }; }; - buildConfigurationList = 65263A971954BC5000B39269 /* Build configuration list for PBXProject "Observable-Swift" */; + buildConfigurationList = 65263A971954BC5000B39269 /* Build configuration list for PBXProject "Observables-Swift" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 65263A931954BC5000B39269; @@ -407,7 +408,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1C93C1351AB0F65D0004FCEF /* Observable-Swift.podspec.json in Resources */, + 1C93C1351AB0F65D0004FCEF /* Observables-Swift.podspec.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -651,12 +652,12 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Observable-Swift/Info.plist"; + INFOPLIST_FILE = "Observables-Swift/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Observable; + PRODUCT_NAME = Observables; SDKROOT = macosx; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -666,12 +667,12 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Observable-Swift/Info.plist"; + INFOPLIST_FILE = "Observables-Swift/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Observable; + PRODUCT_NAME = Observables; SDKROOT = macosx; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -683,12 +684,12 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", ); - INFOPLIST_FILE = "Observable-SwiftTests/Info.plist"; + INFOPLIST_FILE = "Observables-SwiftTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -700,12 +701,12 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", ); - INFOPLIST_FILE = "Observable-SwiftTests/Info.plist"; + INFOPLIST_FILE = "Observables-SwiftTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -715,13 +716,13 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Observable-Swift/Info.plist"; + INFOPLIST_FILE = "Observables-Swift/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Observable; + PRODUCT_NAME = Observables; SDKROOT = iphoneos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -731,13 +732,13 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Observable-Swift/Info.plist"; + INFOPLIST_FILE = "Observables-Swift/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Observable; + PRODUCT_NAME = Observables; SDKROOT = iphoneos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -749,12 +750,12 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = "Observable-SwiftTests/Info.plist"; + INFOPLIST_FILE = "Observables-SwiftTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -766,19 +767,19 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = "Observable-SwiftTests/Info.plist"; + INFOPLIST_FILE = "Observables-SwiftTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.utdloc.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 65263A971954BC5000B39269 /* Build configuration list for PBXProject "Observable-Swift" */ = { + 65263A971954BC5000B39269 /* Build configuration list for PBXProject "Observables-Swift" */ = { isa = XCConfigurationList; buildConfigurations = ( 65263AB11954BC5000B39269 /* Debug */, diff --git a/Observables-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Observables-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..e322eff --- /dev/null +++ b/Observables-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Observables-Swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Observables-Swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Observables-Swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Observable-Swift.xcodeproj/xcshareddata/xcschemes/Observable-iOS.xcscheme b/Observables-Swift.xcodeproj/xcshareddata/xcschemes/Observables-iOS.xcscheme similarity index 84% rename from Observable-Swift.xcodeproj/xcshareddata/xcschemes/Observable-iOS.xcscheme rename to Observables-Swift.xcodeproj/xcshareddata/xcschemes/Observables-iOS.xcscheme index e33c1a2..b375791 100644 --- a/Observable-Swift.xcodeproj/xcshareddata/xcschemes/Observable-iOS.xcscheme +++ b/Observables-Swift.xcodeproj/xcshareddata/xcschemes/Observables-iOS.xcscheme @@ -15,9 +15,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -49,7 +49,7 @@ BlueprintIdentifier = "6592C3051957532100BA8CB7" BuildableName = "Observable-iOS Tests.xctest" BlueprintName = "Observable-iOS Tests" - ReferencedContainer = "container:Observable-Swift.xcodeproj"> + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -57,9 +57,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -79,9 +79,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -97,9 +97,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> diff --git a/Observable-Swift.xcodeproj/xcshareddata/xcschemes/Observable.xcscheme b/Observables-Swift.xcodeproj/xcshareddata/xcschemes/Observables.xcscheme similarity index 84% rename from Observable-Swift.xcodeproj/xcshareddata/xcschemes/Observable.xcscheme rename to Observables-Swift.xcodeproj/xcshareddata/xcschemes/Observables.xcscheme index d91f30d..141eb98 100644 --- a/Observable-Swift.xcodeproj/xcshareddata/xcschemes/Observable.xcscheme +++ b/Observables-Swift.xcodeproj/xcshareddata/xcschemes/Observables.xcscheme @@ -15,9 +15,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -49,7 +49,7 @@ BlueprintIdentifier = "65263AA71954BC5000B39269" BuildableName = "Observable Tests.xctest" BlueprintName = "Observable Tests" - ReferencedContainer = "container:Observable-Swift.xcodeproj"> + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -57,9 +57,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -79,9 +79,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> @@ -97,9 +97,9 @@ + ReferencedContainer = "container:Observables-Swift.xcodeproj"> diff --git a/Observable-Swift/Event.swift b/Observables-Swift/Event.swift similarity index 99% rename from Observable-Swift/Event.swift rename to Observables-Swift/Event.swift index 8d612db..5f034df 100644 --- a/Observable-Swift/Event.swift +++ b/Observables-Swift/Event.swift @@ -1,6 +1,6 @@ // // Event.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 21/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/EventReference.swift b/Observables-Swift/EventReference.swift similarity index 98% rename from Observable-Swift/EventReference.swift rename to Observables-Swift/EventReference.swift index a7ab348..fb4459c 100644 --- a/Observable-Swift/EventReference.swift +++ b/Observables-Swift/EventReference.swift @@ -1,6 +1,6 @@ // // EventReference.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 23/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/EventSubscription.swift b/Observables-Swift/EventSubscription.swift similarity index 98% rename from Observable-Swift/EventSubscription.swift rename to Observables-Swift/EventSubscription.swift index ebe7878..d6a5046 100644 --- a/Observable-Swift/EventSubscription.swift +++ b/Observables-Swift/EventSubscription.swift @@ -1,6 +1,6 @@ // // EventSubscription.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 21/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/Info.plist b/Observables-Swift/Info.plist old mode 100644 new mode 100755 similarity index 100% rename from Observable-Swift/Info.plist rename to Observables-Swift/Info.plist diff --git a/Observable-Swift/Observable.h b/Observables-Swift/Observable.h old mode 100644 new mode 100755 similarity index 100% rename from Observable-Swift/Observable.h rename to Observables-Swift/Observable.h diff --git a/Observable-Swift/Observable.swift b/Observables-Swift/Observable.swift similarity index 98% rename from Observable-Swift/Observable.swift rename to Observables-Swift/Observable.swift index fe8a66a..60a04d3 100644 --- a/Observable-Swift/Observable.swift +++ b/Observables-Swift/Observable.swift @@ -1,6 +1,6 @@ // // Observable.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 20/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/ObservableChainingProxy.swift b/Observables-Swift/ObservableChainingProxy.swift similarity index 92% rename from Observable-Swift/ObservableChainingProxy.swift rename to Observables-Swift/ObservableChainingProxy.swift index 50ee307..d351c2e 100644 --- a/Observable-Swift/ObservableChainingProxy.swift +++ b/Observables-Swift/ObservableChainingProxy.swift @@ -1,6 +1,6 @@ // // Chaining.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 23/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. @@ -117,10 +117,10 @@ public func chain(_ o: O) -> ObservableChainingBase { return ObservableChainingBase(base: o) } -public func / (o: ObservableChainingProxy, f: @escaping (O2.ValueType) -> O3?) -> ObservableChainingProxy, O3> { +public func / (o: ObservableChainingProxy, f: @escaping (O2.ValueType) -> O3?) -> ObservableChainingProxy, O3> { return o.to(path: f) } -public func / (o: O1, f: @escaping (O1.ValueType) -> O2?) -> ObservableChainingProxy { +public func / (o: O1, f: @escaping (O1.ValueType) -> O2?) -> ObservableChainingProxy { return ObservableChainingProxy(base: o, path: f) } diff --git a/Observable-Swift/ObservableProxy.swift b/Observables-Swift/ObservableProxy.swift similarity index 98% rename from Observable-Swift/ObservableProxy.swift rename to Observables-Swift/ObservableProxy.swift index 3c2888f..eb05c0a 100644 --- a/Observable-Swift/ObservableProxy.swift +++ b/Observables-Swift/ObservableProxy.swift @@ -1,6 +1,6 @@ // // ObservableProxy.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 24/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/ObservableReference.swift b/Observables-Swift/ObservableReference.swift similarity index 96% rename from Observable-Swift/ObservableReference.swift rename to Observables-Swift/ObservableReference.swift index 69a4fa1..18841c2 100644 --- a/Observable-Swift/ObservableReference.swift +++ b/Observables-Swift/ObservableReference.swift @@ -1,6 +1,6 @@ // // ObservableReference.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 21/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/OwningEventReference.swift b/Observables-Swift/OwningEventReference.swift similarity index 98% rename from Observable-Swift/OwningEventReference.swift rename to Observables-Swift/OwningEventReference.swift index 2b8ab0a..6d21944 100644 --- a/Observable-Swift/OwningEventReference.swift +++ b/Observables-Swift/OwningEventReference.swift @@ -1,6 +1,6 @@ // // OwningEventReference.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 28/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/Protocols.swift b/Observables-Swift/Protocols.swift similarity index 99% rename from Observable-Swift/Protocols.swift rename to Observables-Swift/Protocols.swift index 77264cf..db531bb 100644 --- a/Observable-Swift/Protocols.swift +++ b/Observables-Swift/Protocols.swift @@ -1,6 +1,6 @@ // // Protocols.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 21/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. diff --git a/Observable-Swift/TupleObservable.swift b/Observables-Swift/TupleObservable.swift similarity index 91% rename from Observable-Swift/TupleObservable.swift rename to Observables-Swift/TupleObservable.swift index 665f0ea..9b22708 100644 --- a/Observable-Swift/TupleObservable.swift +++ b/Observables-Swift/TupleObservable.swift @@ -1,6 +1,6 @@ // // TupleObservable.swift -// Observable-Swift +// Observables-Swift // // Created by Leszek Ślażyński on 20/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. @@ -11,15 +11,15 @@ public class PairObservable : OwnableObser internal typealias T1 = O1.ValueType internal typealias T2 = O2.ValueType - public typealias ValueType = (T1, T2) + public typealias ValueType = (O1.ValueType, O2.ValueType) - public private(set) var beforeChange = EventReference>() - public private(set) var afterChange = EventReference>() + public private(set) var beforeChange = EventReference>() + public private(set) var afterChange = EventReference>() internal var first : T1 internal var second : T2 - public var value : (T1, T2) { return (first, second) } + public var value : ValueType { return (first, second) } private let _base1 : O1 private let _base2 : O2 diff --git a/Observable-SwiftTests/Info.plist b/Observables-SwiftTests/Info.plist old mode 100644 new mode 100755 similarity index 100% rename from Observable-SwiftTests/Info.plist rename to Observables-SwiftTests/Info.plist diff --git a/Observable-SwiftTests/ObservableTests.swift b/Observables-SwiftTests/ObservableTests.swift old mode 100644 new mode 100755 similarity index 99% rename from Observable-SwiftTests/ObservableTests.swift rename to Observables-SwiftTests/ObservableTests.swift index 0018a40..9e44d87 --- a/Observable-SwiftTests/ObservableTests.swift +++ b/Observables-SwiftTests/ObservableTests.swift @@ -1,6 +1,6 @@ // // ObservableTests.swift -// Observable-SwiftTests +// Observables-SwiftTests // // Created by Leszek Ślażyński on 20/06/14. // Copyright (c) 2014 Leszek Ślażyński. All rights reserved. @@ -8,7 +8,7 @@ import XCTest -import Observable +import Observables class ObservableTests: XCTestCase { diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 6d3ce11..1ce9a41 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ Swift lacks the powerful Key Value Observing (KVO) from Objective-C. But thanks ## Overview -Observable-Swift is a Swift library for value observing (via explicit usage of `Observable`) and subscribable events (also explicit, using `Event`). While it is not exactly "KVO for Swift" (it is explicit, there are no "Keys", ...) it is a catchy name so you can call it that if you want. The library is still under development, just as Swift is. Any contributions, both in terms of suggestions/ideas or actual code are welcome. +Observables-Swift is a Swift library for value observing (via explicit usage of `Observable`) and subscribable events (also explicit, using `Event`). While it is not exactly "KVO for Swift" (it is explicit, there are no "Keys", ...) it is a catchy name so you can call it that if you want. The library is still under development, just as Swift is. Any contributions, both in terms of suggestions/ideas or actual code are welcome. -Observable-Swift is brought to you by Leszek Ślażyński (slazyk), you can follow me on [twitter](https://twitter.com/slazyk) and [github](https://github.com/slazyk). +Observables-Swift is brought to you by Leszek Ślażyński (slazyk), you can follow me on [twitter](https://twitter.com/slazyk) and [github](https://github.com/slazyk). Also check out [SINQ](https://github.com/slazyk/SINQ) my other Swift library that makes working with collections a breeze. ### Observables @@ -35,9 +35,9 @@ Under the hood `Observable` uses `beforeChange` and `afterChange` of `EventRe ## Installation -You can use either [CocoaPods](https://cocoapods.org/) or [Carthage](https://github.com/Carthage/Carthage) to install Observable-Swift. +You can use either [CocoaPods](https://cocoapods.org/) or [Carthage](https://github.com/Carthage/Carthage) to install Observables-Swift. -Otherwise, the easiest option to use Observable-Swift in your project is to clone this repo and add Observable-Swift.xcodeproj to your project/workspace and then add Observable.framework to frameworks for your target. +Otherwise, the easiest option to use Observables-Swift in your project is to clone this repo and add Observables-Swift.xcodeproj to your project/workspace and then add Observable.framework to frameworks for your target. After that you just `import Observable`.