Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed naming clash between Observable module and Observable class surfaced when any class name in the including project clashes with a class name in the framework #21

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fixed naming clash between Observable module and Observable class surfaced when any class name in the including project clashes with a class name in the framework #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
212f475
Fixed bug with not being able to create Events when including in Swif…
marchy Dec 3, 2015
ac0a2cf
Renamed product to Observables
marchy Dec 3, 2015
c1c2b5c
Making Observable-Swift compatible Xcode8/swift3
Vaseltior Sep 16, 2016
e6d712d
Specifying swift legacy value for iOS target
Vaseltior Sep 16, 2016
5238ff3
Merge branch 'renamed-master' into feature/naming
marchy Oct 28, 2016
62dba2c
Merge commit 'e6d712dd7fc7a7dfac5457e9e122dcf040839811'
marchy Oct 28, 2016
175f445
Merge commit '5887c2726353939a7c55a6383d87b42d1dcbbd38'
marchy Apr 10, 2017
16df73b
Fix warnings when compiling with Xcode 9 / Swift 3 & 4
FlorianDenis Oct 17, 2017
3c47f76
Merge commit '16df73b73281dd5f3d72de27c32472115c56d509'
marchy Mar 12, 2018
8e2a51f
Swift errors when compiling with Swift 4.2
FlorianDenis Oct 16, 2018
f1ef024
Merge commit '8e2a51f985b80af35e589bdea3a1194391097f9b'
marchy Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified CHANGELOG.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified LICENSE
100644 → 100755
View file
Open in desktop
Empty file.
7 changes: 0 additions & 7 deletions Observable-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions Observable-Swift.podspec.json → Observables-Swift.podspec.json
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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
}
85 changes: 43 additions & 42 deletions Observable-Swift.xcodeproj/project.pbxproj → Observables-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -125,8 +125,8 @@
1C35F8351CA6FE630073DDE4 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
1C35F8361CA6FE630073DDE4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
1C35F8371CA6FE630073DDE4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
1C93C1341AB0F65D0004FCEF /* Observable-Swift.podspec.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Observable-Swift.podspec.json"; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
65263AA21954BC5000B39269 /* Observable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Observable.h; sourceTree = "<group>"; };
65263AA81954BC5000B39269 /* Observable Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Observable Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -138,7 +138,7 @@
65263AC31955004A00B39269 /* ObservableReference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObservableReference.swift; sourceTree = "<group>"; };
65263AC51955D7AE00B39269 /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = "<group>"; };
65263AC71955D83200B39269 /* EventSubscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventSubscription.swift; sourceTree = "<group>"; };
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 = "<group>"; };
65D53669195F711E003B5DA5 /* OwningEventReference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OwningEventReference.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -184,25 +184,25 @@
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 = "<group>";
};
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 = "<group>";
};
65263A9F1954BC5000B39269 /* Observable */ = {
65263A9F1954BC5000B39269 /* Observables */ = {
isa = PBXGroup;
children = (
65263AC11954EBD600B39269 /* Protocols.swift */,
Expand All @@ -218,8 +218,8 @@
65263AA21954BC5000B39269 /* Observable.h */,
65263AA01954BC5000B39269 /* Supporting Files */,
);
name = Observable;
path = "Observable-Swift";
name = Observables;
path = "Observables-Swift";
sourceTree = "<group>";
};
65263AA01954BC5000B39269 /* Supporting Files */ = {
Expand All @@ -230,14 +230,14 @@
name = "Supporting Files";
sourceTree = "<group>";
};
65263AAC1954BC5000B39269 /* ObservableTests */ = {
65263AAC1954BC5000B39269 /* ObservablesTests */ = {
isa = PBXGroup;
children = (
65263AAF1954BC5000B39269 /* ObservableTests.swift */,
65263AAD1954BC5000B39269 /* Supporting Files */,
);
name = ObservableTests;
path = "Observable-SwiftTests";
name = ObservablesTests;
path = "Observables-SwiftTests";
sourceTree = "<group>";
};
65263AAD1954BC5000B39269 /* Supporting Files */ = {
Expand Down Expand Up @@ -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 */ = {
Expand All @@ -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";
};
Expand All @@ -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 */ = {
Expand Down Expand Up @@ -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;
Expand All @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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 */,
Expand Down
7 changes: 7 additions & 0 deletions Observables-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Observables-Swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
20 changes: 10 additions & 10 deletions ...reddata/xcschemes/Observable-iOS.xcscheme → ...eddata/xcschemes/Observables-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6592C2FB1957532100BA8CB7"
BuildableName = "Observable.framework"
BuildableName = "Observables.framework"
BlueprintName = "Observable-iOS"
ReferencedContainer = "container:Observable-Swift.xcodeproj">
ReferencedContainer = "container:Observables-Swift.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -31,7 +31,7 @@
BlueprintIdentifier = "6592C3051957532100BA8CB7"
BuildableName = "Observable-iOS Tests.xctest"
BlueprintName = "Observable-iOS Tests"
ReferencedContainer = "container:Observable-Swift.xcodeproj">
ReferencedContainer = "container:Observables-Swift.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -49,17 +49,17 @@
BlueprintIdentifier = "6592C3051957532100BA8CB7"
BuildableName = "Observable-iOS Tests.xctest"
BlueprintName = "Observable-iOS Tests"
ReferencedContainer = "container:Observable-Swift.xcodeproj">
ReferencedContainer = "container:Observables-Swift.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6592C2FB1957532100BA8CB7"
BuildableName = "Observable.framework"
BuildableName = "Observables.framework"
BlueprintName = "Observable-iOS"
ReferencedContainer = "container:Observable-Swift.xcodeproj">
ReferencedContainer = "container:Observables-Swift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -79,9 +79,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6592C2FB1957532100BA8CB7"
BuildableName = "Observable.framework"
BuildableName = "Observables.framework"
BlueprintName = "Observable-iOS"
ReferencedContainer = "container:Observable-Swift.xcodeproj">
ReferencedContainer = "container:Observables-Swift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -97,9 +97,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6592C2FB1957532100BA8CB7"
BuildableName = "Observable.framework"
BuildableName = "Observables.framework"
BlueprintName = "Observable-iOS"
ReferencedContainer = "container:Observable-Swift.xcodeproj">
ReferencedContainer = "container:Observables-Swift.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Loading