Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@icanzilb
icanzilb committed Aug 10, 2014
1 parent a1b96f7 commit d931bf5
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 547 deletions.
23 changes: 0 additions & 23 deletions JSONModel/JSONModel/JSONModel+CoreData.h
View file

This file was deleted.

127 changes: 0 additions & 127 deletions JSONModel/JSONModel/JSONModel+CoreData.m
View file

This file was deleted.

8 changes: 1 addition & 7 deletions JSONModel/JSONModelLib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,4 @@

//models array
#import "NSArray+JSONModel.h"
#import "JSONModelArray.h"

#ifdef COREDATA_EXTERN
#ifndef UNIT_TESTING
#import "JSONModel+CoreData.h"
#endif
#endif
#import "JSONModelArray.h"
51 changes: 0 additions & 51 deletions JSONModelDemo_iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,8 @@
9C0D0241166E6BBF001EA645 /* KivaViewControllerNetworking.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9C0D023F166E6BBF001EA645 /* KivaViewControllerNetworking.xib */; };
9C28A14118B2A4D2002AEC1E /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C55AF0618903127004EBD8A /* CoreData.framework */; };
9C55AF0718903127004EBD8A /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C55AF0618903127004EBD8A /* CoreData.framework */; };
9C55AF0C189031A8004EBD8A /* CoreDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C55AF0A189031A8004EBD8A /* CoreDataViewController.m */; };
9C55AF0D189031A8004EBD8A /* CoreDataViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9C55AF0B189031A8004EBD8A /* CoreDataViewController.xib */; };
9C55AF0E18903300004EBD8A /* ReposModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CFDD0C5176E977C007B7DFA /* ReposModel.m */; };
9C55AF0F189033AE004EBD8A /* GitHubRepoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CFDD0B3176E977C007B7DFA /* GitHubRepoModel.m */; };
9C55AF1218903448004EBD8A /* github.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9C55AF1018903448004EBD8A /* github.xcdatamodeld */; };
9C55AF1818903ADA004EBD8A /* JSONModel+CoreData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C55AF1718903ADA004EBD8A /* JSONModel+CoreData.m */; };
9C55AF1918903ADA004EBD8A /* JSONModel+CoreData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C55AF1718903ADA004EBD8A /* JSONModel+CoreData.m */; };
9C55AF1C1890494E004EBD8A /* GitHubRepoEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C55AF1B1890494E004EBD8A /* GitHubRepoEntity.m */; };
9C55AF1D1890494E004EBD8A /* GitHubRepoEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C55AF1B1890494E004EBD8A /* GitHubRepoEntity.m */; };
9C66DFA8168CEF420015CCDF /* ArrayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C66DF60168CEF420015CCDF /* ArrayTests.m */; };
9C66DFA9168CEF420015CCDF /* BuiltInConversionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C66DF62168CEF420015CCDF /* BuiltInConversionsTests.m */; };
9C66DFAB168CEF420015CCDF /* CustomPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C66DF66168CEF420015CCDF /* CustomPropsTests.m */; };
Expand Down Expand Up @@ -165,14 +158,6 @@
9C0D023E166E6BBF001EA645 /* KivaViewControllerNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KivaViewControllerNetworking.m; sourceTree = "<group>"; };
9C0D023F166E6BBF001EA645 /* KivaViewControllerNetworking.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KivaViewControllerNetworking.xib; sourceTree = "<group>"; };
9C55AF0618903127004EBD8A /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
9C55AF09189031A8004EBD8A /* CoreDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreDataViewController.h; sourceTree = "<group>"; };
9C55AF0A189031A8004EBD8A /* CoreDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreDataViewController.m; sourceTree = "<group>"; };
9C55AF0B189031A8004EBD8A /* CoreDataViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CoreDataViewController.xib; sourceTree = "<group>"; };
9C55AF1118903448004EBD8A /* github.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = github.xcdatamodel; sourceTree = "<group>"; };
9C55AF1618903ADA004EBD8A /* JSONModel+CoreData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSONModel+CoreData.h"; sourceTree = "<group>"; };
9C55AF1718903ADA004EBD8A /* JSONModel+CoreData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSONModel+CoreData.m"; sourceTree = "<group>"; };
9C55AF1A1890494E004EBD8A /* GitHubRepoEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitHubRepoEntity.h; sourceTree = "<group>"; };
9C55AF1B1890494E004EBD8A /* GitHubRepoEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GitHubRepoEntity.m; sourceTree = "<group>"; };
9C66DF5F168CEF420015CCDF /* ArrayTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayTests.h; sourceTree = "<group>"; };
9C66DF60168CEF420015CCDF /* ArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArrayTests.m; sourceTree = "<group>"; };
9C66DF61168CEF420015CCDF /* BuiltInConversionsTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltInConversionsTests.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -391,19 +376,6 @@
name = "KivaJSONDemo+networking";
sourceTree = "<group>";
};
9C55AF0818903168004EBD8A /* CoreDataDemo */ = {
isa = PBXGroup;
children = (
9C55AF09189031A8004EBD8A /* CoreDataViewController.h */,
9C55AF0A189031A8004EBD8A /* CoreDataViewController.m */,
9C55AF0B189031A8004EBD8A /* CoreDataViewController.xib */,
9C55AF1018903448004EBD8A /* github.xcdatamodeld */,
9C55AF1A1890494E004EBD8A /* GitHubRepoEntity.h */,
9C55AF1B1890494E004EBD8A /* GitHubRepoEntity.m */,
);
name = CoreDataDemo;
sourceTree = "<group>";
};
9C66DF5E168CEF420015CCDF /* UnitTests */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -497,8 +469,6 @@
9C66E011168CF0AA0015CCDF /* JSONModelClassProperty.m */,
9C66E012168CF0AA0015CCDF /* JSONModelError.h */,
9C66E013168CF0AA0015CCDF /* JSONModelError.m */,
9C55AF1618903ADA004EBD8A /* JSONModel+CoreData.h */,
9C55AF1718903ADA004EBD8A /* JSONModel+CoreData.m */,
);
path = JSONModel;
sourceTree = "<group>";
Expand Down Expand Up @@ -572,7 +542,6 @@
9CBBBEE2166B6CF0008B4326 /* JSONModelDemo_iOS */ = {
isa = PBXGroup;
children = (
9C55AF0818903168004EBD8A /* CoreDataDemo */,
9CBBBFAD166BB87B008B4326 /* DemoApp */,
9CBBBF87166BAC31008B4326 /* libs */,
9CBBBF9D166BB27E008B4326 /* YouTubeDemo */,
Expand Down Expand Up @@ -863,7 +832,6 @@
9CBBBEF1166B6CF0008B4326 /* Default@2x.png in Resources */,
9CBBBEF3166B6CF0008B4326 /* Default-568h@2x.png in Resources */,
9CBBBEFC166B6CF0008B4326 /* MasterViewController.xib in Resources */,
9C55AF0D189031A8004EBD8A /* CoreDataViewController.xib in Resources */,
9CBBBF78166BA80F008B4326 /* KivaViewController.xib in Resources */,
9CBBBF8F166BAC54008B4326 /* btnCheck.png in Resources */,
9CBBBF90166BAC54008B4326 /* btnCheck@2x.png in Resources */,
Expand Down Expand Up @@ -916,7 +884,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9C55AF0C189031A8004EBD8A /* CoreDataViewController.m in Sources */,
9CBBBEE9166B6CF0008B4326 /* main.m in Sources */,
9CBBBEED166B6CF0008B4326 /* AppDelegate.m in Sources */,
9CBBBEF6166B6CF0008B4326 /* MasterViewController.m in Sources */,
Expand All @@ -926,18 +893,15 @@
9CBBBF82166BA86A008B4326 /* KivaFeed.m in Sources */,
9CBBBF91166BAC54008B4326 /* HUD.m in Sources */,
9CBBBF92166BAC54008B4326 /* MBProgressHUD.m in Sources */,
9C55AF1818903ADA004EBD8A /* JSONModel+CoreData.m in Sources */,
9CBBBF97166BAED2008B4326 /* GitHubViewController.m in Sources */,
9CBBBF9C166BAEF5008B4326 /* GitHubUserModel.m in Sources */,
9CBBBFA1166BB29B008B4326 /* YouTubeViewController.m in Sources */,
9CBBBFA5166BB2AD008B4326 /* VideoModel.m in Sources */,
9C55AF1218903448004EBD8A /* github.xcdatamodeld in Sources */,
9CBBBFA9166BB3E1008B4326 /* VideoTitle.m in Sources */,
9CBBBFAC166BB3EC008B4326 /* VideoLink.m in Sources */,
9C55AF0F189033AE004EBD8A /* GitHubRepoModel.m in Sources */,
9CBBBFB1166BBB05008B4326 /* MyDataModel.m in Sources */,
9CBBBFB5166BBB21008B4326 /* StorageViewController.m in Sources */,
9C55AF1C1890494E004EBD8A /* GitHubRepoEntity.m in Sources */,
9C0D0240166E6BBF001EA645 /* KivaViewControllerNetworking.m in Sources */,
9C55AF0E18903300004EBD8A /* ReposModel.m in Sources */,
9C66E024168CF0AA0015CCDF /* JSONModel.m in Sources */,
Expand Down Expand Up @@ -979,7 +943,6 @@
9CCAFD921901B44300314886 /* SpecialPropertiesTests.m in Sources */,
9C66E02D168CF0AA0015CCDF /* NSArray+JSONModel.m in Sources */,
9C66E02F168CF0AA0015CCDF /* JSONAPI.m in Sources */,
9C55AF1D1890494E004EBD8A /* GitHubRepoEntity.m in Sources */,
9C66E031168CF0AA0015CCDF /* JSONHTTPClient.m in Sources */,
9C66E033168CF0AA0015CCDF /* JSONModel+networking.m in Sources */,
9C66E035168CF0AA0015CCDF /* JSONKeyMapper.m in Sources */,
Expand All @@ -999,7 +962,6 @@
9CFDD0D0176E977C007B7DFA /* GitHubRepoModel.m in Sources */,
9CFDD0D1176E977C007B7DFA /* GitHubRepoModelForUSMapper.m in Sources */,
9CFDD0D2176E977C007B7DFA /* ImageModel.m in Sources */,
9C55AF1918903ADA004EBD8A /* JSONModel+CoreData.m in Sources */,
9CFDD0D3176E977C007B7DFA /* JSONTypesModel.m in Sources */,
9CFDD0D4176E977C007B7DFA /* NestedModel.m in Sources */,
9CFDD0D5176E977C007B7DFA /* OptionalPropModel.m in Sources */,
Expand Down Expand Up @@ -1201,19 +1163,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCVersionGroup section */
9C55AF1018903448004EBD8A /* github.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
9C55AF1118903448004EBD8A /* github.xcdatamodel */,
);
currentVersion = 9C55AF1118903448004EBD8A /* github.xcdatamodel */;
path = github.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
/* End XCVersionGroup section */
};
rootObject = 9CBBBECF166B6CEF008B4326 /* Project object */;
}
1 change: 1 addition & 0 deletions JSONModelDemo_iOS/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

MasterViewController *masterViewController = [[MasterViewController alloc] initWithNibName:@"MasterViewController" bundle:nil];
self.navigationController = [[UINavigationController alloc] initWithRootViewController:masterViewController];
self.navigationController.navigationBar.barStyle = UIBarStyleBlackOpaque;
self.window.rootViewController = self.navigationController;
[self.window makeKeyAndVisible];
return YES;
Expand Down
14 changes: 0 additions & 14 deletions JSONModelDemo_iOS/CoreDataViewController.h
View file

This file was deleted.

Loading

0 comments on commit d931bf5

Please sign in to comment.