JSONModel->GMJSONModel

64dce706 · 汪洋 · 06a20854 · 64dce706 · 64dce706 · 64dce706
Commit 64dce706 authored May 14, 2018 by 汪洋
5 changed files
--- a/Example/GMBase.xcodeproj/project.pbxproj
+++ b/Example/GMBase.xcodeproj/project.pbxproj
@@ -76,7 +76,7 @@
 		D3EB0CC21D33968300EEDD8B /* GMListViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMListViewModel.h; sourceTree = "<group>"; };
 		D3EB0CC31D33968300EEDD8B /* GMListViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GMListViewModel.m; sourceTree = "<group>"; };
 		E10ABE29C983D16788B32755 /* Pods-GMBase_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMBase_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GMBase_Tests/Pods-GMBase_Tests.debug.xcconfig"; sourceTree = "<group>"; };
-		FC7ED23958C6EFD0277A557F /* GMBase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMBase.podspec; path = ../GMBase.podspec; sourceTree = "<group>"; };
+		FC7ED23958C6EFD0277A557F /* GMBase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMBase.podspec; path = ../GMBase.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -341,13 +341,12 @@
 				"${BUILT_PRODUCTS_DIR}/GMBase/GMBase.framework",
 				"${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework",
 				"${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework",
+				"${BUILT_PRODUCTS_DIR}/GMJSONModel/GMJSONModel.framework",
 				"${BUILT_PRODUCTS_DIR}/GMKit/GMKit.framework",
 				"${BUILT_PRODUCTS_DIR}/GMNetService/GMNetService.framework",
 				"${BUILT_PRODUCTS_DIR}/GMPhobos/GMPhobos.framework",
 				"${BUILT_PRODUCTS_DIR}/GMRefresh/GMRefresh.framework",
-				"${BUILT_PRODUCTS_DIR}/JSONModel/JSONModel.framework",
 				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
-				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/TMCache/TMCache.framework",
@@ -359,13 +358,12 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMBase.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMJSONModel.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMNetService.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMPhobos.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRefresh.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSONModel.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TMCache.framework",

--- a/Example/GMBase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/Example/GMBase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+<?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>
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -14,65 +14,63 @@ PODS:
  - AFNetworking/Serialization (3.1.0)
  - AFNetworking/UIKit (3.1.0):
    - AFNetworking/NSURLSession
-  - GMBase (0.3.9):
+  - GMBase (0.4.0):
    - GMHud
+    - GMJSONModel
    - GMKit
    - GMNetService
    - GMPhobos
    - GMRefresh
-    - JSONModel (= 1.7.0)
    - MBProgressHUD
    - UITableView+FDTemplateLayoutCell (= 1.4)
  - GMCache (0.2.0):
    - TMCache (= 2.1.0)
-  - GMHud (0.1.3):
+  - GMHud (0.1.4):
    - MBProgressHUD (= 0.9.2)
-  - GMKit (0.8.5):
-    - GMKit/Category (= 0.8.5)
-    - GMKit/Color (= 0.8.5)
-    - GMKit/Constant (= 0.8.5)
-    - GMKit/FDFullscreenPopGesture (= 0.8.5)
-    - GMKit/Kit (= 0.8.5)
-    - GMKit/Protocol (= 0.8.5)
+  - GMJSONModel (1.7.1)
+  - GMKit (0.8.8):
+    - GMKit/Category (= 0.8.8)
+    - GMKit/Color (= 0.8.8)
+    - GMKit/Constant (= 0.8.8)
+    - GMKit/FDFullscreenPopGesture (= 0.8.8)
+    - GMKit/Kit (= 0.8.8)
+    - GMKit/Protocol (= 0.8.8)
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMKit/Category (0.8.5):
-    - GMKit/Color (= 0.8.5)
-    - GMKit/Constant (= 0.8.5)
-    - GMKit/Protocol (= 0.8.5)
+  - GMKit/Category (0.8.8):
+    - GMKit/Color (= 0.8.8)
+    - GMKit/Constant (= 0.8.8)
+    - GMKit/Protocol (= 0.8.8)
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMKit/Color (0.8.5):
+  - GMKit/Color (0.8.8):
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMKit/Constant (0.8.5):
+  - GMKit/Constant (0.8.8):
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMKit/FDFullscreenPopGesture (0.8.5):
+  - GMKit/FDFullscreenPopGesture (0.8.8):
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMKit/Kit (0.8.5):
-    - GMKit/Category (= 0.8.5)
-    - GMKit/Color (= 0.8.5)
-    - GMKit/Constant (= 0.8.5)
-    - GMKit/Protocol (= 0.8.5)
+  - GMKit/Kit (0.8.8):
+    - GMKit/Category (= 0.8.8)
+    - GMKit/Color (= 0.8.8)
+    - GMKit/Constant (= 0.8.8)
+    - GMKit/Protocol (= 0.8.8)
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMKit/Protocol (0.8.5):
+  - GMKit/Protocol (0.8.8):
    - Masonry (= 1.1.0)
    - SDWebImage (= 3.7.6)
-  - GMNetService (0.1.9):
+  - GMNetService (0.1.91):
    - AFNetworking (= 3.1.0)
  - GMPhobos (0.5.5):
    - GMCache (= 0.2.0)
    - GMKit
-  - GMRefresh (0.1.7):
+  - GMRefresh (0.2.0):
    - GMPhobos
-    - MJRefresh (= 3.1.14)
-  - JSONModel (1.7.0)
  - Masonry (1.1.0)
  - MBProgressHUD (0.9.2)
-  - MJRefresh (3.1.14)
  - SDWebImage (3.7.6):
    - SDWebImage/Core (= 3.7.6)
  - SDWebImage/Core (3.7.6)
@@ -88,17 +86,16 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  GMBase: 4375fba9270ea77dc8e54d847cc3a5b96f12932e
+  GMBase: fc92fb4702b70951c2f9458c03a9a29723281c08
  GMCache: b7d48432ee2469eb0c6c86c720a1958bd373187e
-  GMHud: 74387462a8b9f099c760a1ddbf493cc86da7cdbc
-  GMKit: 39ca9fdf84f75f4baad186585faef4dbef82f73b
-  GMNetService: 0109b08ccb149b0c0a7a4601ec17930c7d9a8007
+  GMHud: 9cc3942fc9f215db55b134cbfd05a458b124a964
+  GMJSONModel: d2639b4bee1946687fc71b80123567510b5fe565
+  GMKit: c391d788905c730445781095c5a2113a6bbf0d06
+  GMNetService: 28753d087267511bebb3ec9944baa917bcc1a64d
  GMPhobos: d3741744a77fb40df027cc846b14e5687b931e00
-  GMRefresh: 7e176b90fd8d37b0b738c813d71349fd55d86443
-  JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
+  GMRefresh: 021ccae1b905e05c0c82e9c0180f617f593d227c
  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
  MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
-  MJRefresh: 6642e35b3227a5447b9fd5e17c552c90196c9859
  SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
  TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
  UITableView+FDTemplateLayoutCell: 234e1582bcc4e18461af91155123bb96538ed030

--- a/GMBase.podspec
+++ b/GMBase.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
    s.source_files = 'GMBase/Classes/**/*'

    s.dependency 'GMRefresh'
-    s.dependency 'JSONModel',   '1.7.0'
+    s.dependency 'GMJSONModel'
    s.dependency 'UITableView+FDTemplateLayoutCell',   '1.4'
    s.dependency 'GMNetService'
    s.dependency 'MBProgressHUD'

--- a/GMBase/Classes/GMObject.h
+++ b/GMBase/Classes/GMObject.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Wanmeichuangyi. All rights reserved.
 //

-#import <JSONModel/JSONModel.h>
+@import GMJSONModel;

 @interface GMObject : JSONModel