Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
Merge pull request #40 from redbooth/folderStructureCarthage
Browse files Browse the repository at this point in the history 
Folder structure adapted for Carthage
  • Loading branch information
@polqf
polqf committed Oct 14, 2015
2 parents 884223c + 3f73c92 commit 1caceb1
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 11 deletions.
1 change: 0 additions & 1 deletion Example/Cartfile → Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
github "Quick/Nimble" "v2.0.0"
github "Quick/Quick" "v0.6.0"
github "realm/realm-cocoa" "v0.95.3"
0 Example/Cartfile.resolved → Cartfile.resolved
View file
File renamed without changes.
23 changes: 13 additions & 10 deletions ...sultsController.xcodeproj/project.pbxproj → ...sultsController.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
6A1010FB1B74A83600321CE6 /* RealmSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RealmSection.swift; path = ../../Source/RealmSection.swift; sourceTree = "<group>"; };
6A1010FD1B74C5BB00321CE6 /* RealmSectionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmSectionSpec.swift; sourceTree = "<group>"; };
6A1010FF1B74C92200321CE6 /* RealmExtensionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmExtensionSpec.swift; sourceTree = "<group>"; };
6A29729B1BC55D6C004D9EC9 /* RealmThreadHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmThreadHelper.swift; sourceTree = "<group>"; };
6A29729B1BC55D6C004D9EC9 /* RealmThreadHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RealmThreadHelper.swift; path = ../../Source/RealmThreadHelper.swift; sourceTree = "<group>"; };
6A5F153D1B736D5300250E29 /* test.realm */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.realm; sourceTree = "<group>"; };
6A68B20B1B735CFB007645A7 /* RealmResultsCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmResultsCacheTests.swift; sourceTree = "<group>"; };
C11D6BE71B7A0F72000B8398 /* RealmChange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RealmChange.swift; path = ../../Source/RealmChange.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -203,7 +203,8 @@
C18C376D1B72670F008DE6A6 /* LaunchScreen.storyboard */,
C18C37701B72670F008DE6A6 /* Info.plist */,
);
path = RealmResultsController;
name = RealmResultsController;
path = Example/RealmResultsController;
sourceTree = "<group>";
};
C1A0028C1B9702C1000C0E8C /* RealmResultsController-iOS */ = {
Expand All @@ -222,7 +223,8 @@
6A29729B1BC55D6C004D9EC9 /* RealmThreadHelper.swift */,
C1A0028F1B9702C1000C0E8C /* Info.plist */,
);
path = "RealmResultsController-iOS";
name = "RealmResultsController-iOS";
path = "Example/RealmResultsController-iOS";
sourceTree = "<group>";
};
C1A0029A1B9702C2000C0E8C /* RealmResultsController-iOSTests */ = {
Expand All @@ -240,7 +242,8 @@
6A5F153D1B736D5300250E29 /* test.realm */,
C1A0029D1B9702C2000C0E8C /* Info.plist */,
);
path = "RealmResultsController-iOSTests";
name = "RealmResultsController-iOSTests";
path = "Example/RealmResultsController-iOSTests";
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -577,7 +580,7 @@
"$(PROJECT_DIR)/RealmResultsController/Frameworks",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = RealmResultsController/Info.plist;
INFOPLIST_FILE = Example/RealmResultsController/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = redbooth.RealmResultsController;
Expand All @@ -594,7 +597,7 @@
"$(PROJECT_DIR)/RealmResultsController/Frameworks",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = RealmResultsController/Info.plist;
INFOPLIST_FILE = Example/RealmResultsController/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = redbooth.RealmResultsController;
Expand All @@ -615,7 +618,7 @@
"$(PROJECT_DIR)/RealmResultsController/Frameworks",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "RealmResultsController-iOS/Info.plist";
INFOPLIST_FILE = "Example/RealmResultsController-iOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -640,7 +643,7 @@
"$(PROJECT_DIR)/RealmResultsController/Frameworks",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "RealmResultsController-iOS/Info.plist";
INFOPLIST_FILE = "Example/RealmResultsController-iOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -660,7 +663,7 @@
"$(PROJECT_DIR)/RealmResultsController/Frameworks",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "RealmResultsController-iOSTests/Info.plist";
INFOPLIST_FILE = "Example/RealmResultsController-iOSTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "redbooth.RealmResultsController-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -676,7 +679,7 @@
"$(PROJECT_DIR)/RealmResultsController/Frameworks",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "RealmResultsController-iOSTests/Info.plist";
INFOPLIST_FILE = "Example/RealmResultsController-iOSTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "redbooth.RealmResultsController-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
0 ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
View file
File renamed without changes.
0 ...hemes/RealmResultsController-iOS.xcscheme → ...hemes/RealmResultsController-iOS.xcscheme
View file
File renamed without changes.
1 change: 1 addition & 0 deletions Source/RealmResultsController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ public class RealmResultsController<T: Object, U> : RealmResultsCacheDelegate {
- returns: the objects count at the sectionIndex
*/
public func numberOfObjectsAt(sectionIndex: Int) -> Int {
if cache.sections.count == 0 { return 0 }
return cache.sections[sectionIndex].objects.count
}

Expand Down
0 ...ltsController-iOS/RealmThreadHelper.swift → Source/RealmThreadHelper.swift
View file
File renamed without changes.

0 comments on commit 1caceb1

Please sign in to comment.