From 94247246916e2a9b79b8b1d11df590a9641f1460 Mon Sep 17 00:00:00 2001 From: Kjuly Date: Sat, 27 Aug 2016 00:36:47 +0800 Subject: [PATCH] Update project setting; Rm submodule: JSONKit --- .gitmodules | 3 - Master.xcodeproj/project.pbxproj | 14 --- .../xcshareddata/Master.xcscmblueprint | 115 ++++++++++++++++++ Master/Libs/JSONKit | 1 - Master/Master-Info.plist | 2 +- 5 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 Master.xcodeproj/project.xcworkspace/xcshareddata/Master.xcscmblueprint delete mode 160000 Master/Libs/JSONKit diff --git a/.gitmodules b/.gitmodules index 336730f0..83933894 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "Master/Libs/KYCircleMenu"] path = Master/Libs/KYCircleMenu url = git://github.com/Kjuly/KYCircleMenu.git -[submodule "Master/Libs/JSONKit"] - path = Master/Libs/JSONKit - url = git://github.com/Kjuly/JSONKit.git [submodule "Master/Libs/AFNetworking"] path = Master/Libs/AFNetworking url = git://github.com/Kjuly/AFNetworking.git diff --git a/Master.xcodeproj/project.pbxproj b/Master.xcodeproj/project.pbxproj index f5358f45..6fef72a1 100644 --- a/Master.xcodeproj/project.pbxproj +++ b/Master.xcodeproj/project.pbxproj @@ -474,7 +474,6 @@ 7FC5B16B154EDC07001CECBA /* PurchaseTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC5B16A154EDC07001CECBA /* PurchaseTableViewController.m */; }; 7FC6C79E16B6F45B005E29CB /* AppInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC6C79D16B6F45B005E29CB /* AppInfoViewController.m */; }; 7FC6C7A116B6F4E9005E29CB /* UIFont+Custom.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC6C7A016B6F4E9005E29CB /* UIFont+Custom.m */; }; - 7FC847A3169C30750013D5FF /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC847A0169C30750013D5FF /* JSONKit.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 7FCBFE4B1568C331001C8BAB /* IconMoveBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FCBFE491568C331001C8BAB /* IconMoveBackground.png */; }; 7FCBFE4C1568C331001C8BAB /* IconMoveBackground@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FCBFE4A1568C331001C8BAB /* IconMoveBackground@2x.png */; }; 7FCBFE4F1568DBCE001C8BAB /* MoveDetailRoundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBFE4E1568DBCE001C8BAB /* MoveDetailRoundView.m */; }; @@ -1300,8 +1299,6 @@ 7FC6C79D16B6F45B005E29CB /* AppInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfoViewController.m; sourceTree = ""; }; 7FC6C79F16B6F4E9005E29CB /* UIFont+Custom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+Custom.h"; sourceTree = ""; }; 7FC6C7A016B6F4E9005E29CB /* UIFont+Custom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+Custom.m"; sourceTree = ""; }; - 7FC8479F169C30750013D5FF /* JSONKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONKit.h; sourceTree = ""; }; - 7FC847A0169C30750013D5FF /* JSONKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONKit.m; sourceTree = ""; }; 7FCBFE491568C331001C8BAB /* IconMoveBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = IconMoveBackground.png; sourceTree = ""; }; 7FCBFE4A1568C331001C8BAB /* IconMoveBackground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "IconMoveBackground@2x.png"; sourceTree = ""; }; 7FCBFE4D1568DBCE001C8BAB /* MoveDetailRoundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoveDetailRoundView.h; sourceTree = ""; }; @@ -2063,7 +2060,6 @@ 7F10F48516AFBCD300A85587 /* KYArcTab */, 7F56996916A959E80045EA23 /* KYiOSFoundation */, 7FA4469F169C34A90024D668 /* GTMOAuth2 */, - 7FC8479D169C30750013D5FF /* JSONKit */, 7F8E312D169BD1B2008A3F19 /* Cocos2D-iPhone */, 7F8E2E1D169BB94A008A3F19 /* TestFlightSDK */, ); @@ -2610,15 +2606,6 @@ path = GameView; sourceTree = ""; }; - 7FC8479D169C30750013D5FF /* JSONKit */ = { - isa = PBXGroup; - children = ( - 7FC8479F169C30750013D5FF /* JSONKit.h */, - 7FC847A0169C30750013D5FF /* JSONKit.m */, - ); - path = JSONKit; - sourceTree = ""; - }; 7FEAE80214FD00DC003679C1 /* MainView */ = { isa = PBXGroup; children = ( @@ -3330,7 +3317,6 @@ 7F8E37C2169BD1BE008A3F19 /* FontManager.m in Sources */, 7F8E37C3169BD1BE008A3F19 /* ZAttributedString.m in Sources */, 7F8E37C4169BD1BE008A3F19 /* ZFont.m in Sources */, - 7FC847A3169C30750013D5FF /* JSONKit.m in Sources */, 7FB70EEA17E3F48A00A927E1 /* ioapi.c in Sources */, 7FA44718169C34A90024D668 /* GTMGatherInputStream.m in Sources */, 7FA44719169C34A90024D668 /* GTMHTTPFetcher.m in Sources */, diff --git a/Master.xcodeproj/project.xcworkspace/xcshareddata/Master.xcscmblueprint b/Master.xcodeproj/project.xcworkspace/xcshareddata/Master.xcscmblueprint new file mode 100644 index 00000000..fc554c8a --- /dev/null +++ b/Master.xcodeproj/project.xcworkspace/xcshareddata/Master.xcscmblueprint @@ -0,0 +1,115 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "0733C0362A394BE3C957EA224A3F53DE0726977F", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + "c149197c-92b2-435d-9462-ce57b7db7bff++3047" : { + + }, + "22754eea-fc93-e339-b032-c1f495b90c16++2896" : { + + }, + "b3aa69f0-f65c-a609-0a27-78855af037c1++2896" : { + + } + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "52029122B5BBFB91B393EC96F6D84F7C81F9F191" : 0, + "EF51387A5AF28E4351AFB0302884600583A438B5" : 0, + "0177D6766FA139FB44F762FE592992D1EBB2559E" : 0, + "DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8" : 0, + "0733C0362A394BE3C957EA224A3F53DE0726977F" : 0, + "4182765C525509B305166AB949D5935FD5C85212" : 0, + "b3aa69f0-f65c-a609-0a27-78855af037c1++2896" : 0, + "22754eea-fc93-e339-b032-c1f495b90c16++2896" : 0, + "4A92347980A55D37059352113535067CD8E8115E" : 0, + "65E71B0513DBFB09F39CEEF3A8B769CB93E66994" : 0, + "01EBC7BF61F3168A811F4B311042641767FA2224" : 0, + "A856912500F0A7CB003C82B4D6C17FE421502F51" : 0, + "c149197c-92b2-435d-9462-ce57b7db7bff++3047" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "7B551217-EF88-461B-9DCE-7082A3785F82", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "52029122B5BBFB91B393EC96F6D84F7C81F9F191" : "iPokeMon\/Master\/Libs\/Cocos2D-iPhone\/", + "EF51387A5AF28E4351AFB0302884600583A438B5" : "iPokeMon\/Master\/Libs\/JSONKit\/", + "0177D6766FA139FB44F762FE592992D1EBB2559E" : "iPokeMon\/Master\/Libs\/GTMOAuth2\/", + "DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8" : "iPokeMon\/Master\/Libs\/AFNetworking\/", + "0733C0362A394BE3C957EA224A3F53DE0726977F" : "iPokeMon\/", + "4182765C525509B305166AB949D5935FD5C85212" : "iPokeMon\/Master\/Libs\/MBProgressHUD\/", + "b3aa69f0-f65c-a609-0a27-78855af037c1++2896" : "iPokeMon\/Master\/Libs\/GTMOAuth2\/HTTPFetcher\/", + "22754eea-fc93-e339-b032-c1f495b90c16++2896" : "iPokeMon\/Master\/Libs\/GTMOAuth2\/Source\/", + "4A92347980A55D37059352113535067CD8E8115E" : "iPokeMon\/Master\/Libs\/KYCircleMenu\/", + "65E71B0513DBFB09F39CEEF3A8B769CB93E66994" : "iPokeMon\/Master\/Libs\/SSZipArchive\/", + "01EBC7BF61F3168A811F4B311042641767FA2224" : "iPokeMon\/Master\/Libs\/KYUnlockCodeManager\/", + "A856912500F0A7CB003C82B4D6C17FE421502F51" : "iPokeMon\/Master\/Libs\/KYArcTab\/", + "c149197c-92b2-435d-9462-ce57b7db7bff++3047" : "iPokeMon\/Master\/Libs\/GTMOAuth2\/JSON\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "Master", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Master.xcodeproj", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/Kjuly\/GTMOAuth2.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0177D6766FA139FB44F762FE592992D1EBB2559E" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:Kjuly\/KYUnlockCodeManager.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "01EBC7BF61F3168A811F4B311042641767FA2224" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:Kjuly\/iPokeMon.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0733C0362A394BE3C957EA224A3F53DE0726977F" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "http:\/\/gtm-oauth2.googlecode.com\/svn", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Subversion", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "22754eea-fc93-e339-b032-c1f495b90c16++2896" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/iOSLabs\/MBProgressHUD.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4182765C525509B305166AB949D5935FD5C85212" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/Kjuly\/KYCircleMenu.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4A92347980A55D37059352113535067CD8E8115E" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/iOSLabs\/cocos2d-iphone.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "52029122B5BBFB91B393EC96F6D84F7C81F9F191" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:Kjuly\/ssziparchive.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "65E71B0513DBFB09F39CEEF3A8B769CB93E66994" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:Kjuly\/KYArcTab.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "A856912500F0A7CB003C82B4D6C17FE421502F51" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/Kjuly\/AFNetworking.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/Kjuly\/JSONKit.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "EF51387A5AF28E4351AFB0302884600583A438B5" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "http:\/\/gtm-http-fetcher.googlecode.com\/svn", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Subversion", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "b3aa69f0-f65c-a609-0a27-78855af037c1++2896" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/stig\/json-framework.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Subversion", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "c149197c-92b2-435d-9462-ce57b7db7bff++3047" + } + ] +} \ No newline at end of file diff --git a/Master/Libs/JSONKit b/Master/Libs/JSONKit deleted file mode 160000 index 82157634..00000000 --- a/Master/Libs/JSONKit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82157634ca0ca5b6a4a67a194dd11f15d9b72835 diff --git a/Master/Master-Info.plist b/Master/Master-Info.plist index d67d4733..2d87cd48 100644 --- a/Master/Master-Info.plist +++ b/Master/Master-Info.plist @@ -3,7 +3,7 @@ CFBuildDate - Apr 06 15:05:47 GMT 2015 + Aug 26 16:35:12 GMT 2016 CFBundleDevelopmentRegion en CFBundleDisplayName