Skip to content

Commit 81e9014

Browse files
committed
Support Framework
1 parent 004bce7 commit 81e9014

File tree

8 files changed

+64
-35
lines changed

8 files changed

+64
-35
lines changed

Example/MCJSONKit.xcodeproj/project.pbxproj

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
09CA1D63819349D3A4D59DAA /* libPods-MCJSONKit_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F13FC4735500A7B6B0F6FAA7 /* libPods-MCJSONKit_Example.a */; };
1110
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
1211
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
1312
6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -22,8 +21,9 @@
2221
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
2322
6003F5BC195388D20070C39A /* MCTypeTransformTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* MCTypeTransformTest.m */; };
2423
71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
24+
7B81934F14A75417567CA068 /* Pods_MCJSONKit_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06E305F5392910FF0D91D684 /* Pods_MCJSONKit_Example.framework */; };
2525
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
26-
C0B20416D9A80E49B8F4ED42 /* libPods-MCJSONKit_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 24EDCF03A8161914A8A24114 /* libPods-MCJSONKit_Tests.a */; };
26+
949A4D1448E6EDFB2E7158B1 /* Pods_MCJSONKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940EA6A2D3A089AEC7844AF8 /* Pods_MCJSONKit_Tests.framework */; };
2727
C55E4A9820A7DA3800DE037D /* MCNSObjectSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = C55E4A9720A7DA3800DE037D /* MCNSObjectSpec.m */; };
2828
C55E4A9D20A7E17000DE037D /* mock in Resources */ = {isa = PBXBuildFile; fileRef = C55E4A9B20A7DD8500DE037D /* mock */; };
2929
C55E4AA120A7FD9900DE037D /* MCPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = C55E4AA020A7FD9900DE037D /* MCPerformance.m */; };
@@ -45,7 +45,7 @@
4545
/* End PBXContainerItemProxy section */
4646

4747
/* Begin PBXFileReference section */
48-
24EDCF03A8161914A8A24114 /* libPods-MCJSONKit_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MCJSONKit_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
48+
06E305F5392910FF0D91D684 /* Pods_MCJSONKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MCJSONKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4949
59D90BEEF760ECD471BB9AB3 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
5050
6003F58A195388D20070C39A /* MCJSONKit_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MCJSONKit_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
5151
6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -70,6 +70,7 @@
7070
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
7171
918927202B39C27266615D47 /* Pods-MCJSONKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MCJSONKit_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-MCJSONKit_Example/Pods-MCJSONKit_Example.release.xcconfig"; sourceTree = "<group>"; };
7272
93190E7B99844BBF7607513E /* Pods-MCJSONKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MCJSONKit_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MCJSONKit_Example/Pods-MCJSONKit_Example.debug.xcconfig"; sourceTree = "<group>"; };
73+
940EA6A2D3A089AEC7844AF8 /* Pods_MCJSONKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MCJSONKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7374
9ABBD34770007F25E1BFC826 /* Pods-MCJSONKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MCJSONKit_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MCJSONKit_Tests/Pods-MCJSONKit_Tests.release.xcconfig"; sourceTree = "<group>"; };
7475
B9C051CDCDC5724A854F4F8E /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
7576
C55E4A9720A7DA3800DE037D /* MCNSObjectSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MCNSObjectSpec.m; sourceTree = "<group>"; };
@@ -85,7 +86,6 @@
8586
C599F3CC1FAD902D00D19382 /* UserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserModel.h; sourceTree = "<group>"; };
8687
C5D2A9C220A716EB008998BD /* WeiboResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeiboResult.h; sourceTree = "<group>"; };
8788
C5D2A9C320A716EB008998BD /* WeiboResult.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WeiboResult.m; sourceTree = "<group>"; };
88-
F13FC4735500A7B6B0F6FAA7 /* libPods-MCJSONKit_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MCJSONKit_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8989
F6BB5D2C14E6D372E0B9ECCD /* Pods-MCJSONKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MCJSONKit_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MCJSONKit_Tests/Pods-MCJSONKit_Tests.debug.xcconfig"; sourceTree = "<group>"; };
9090
FBBF959A9D0B72C5EC1D5E5D /* MCJSONKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = MCJSONKit.podspec; path = ../MCJSONKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
9191
/* End PBXFileReference section */
@@ -98,7 +98,7 @@
9898
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
9999
6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
100100
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
101-
09CA1D63819349D3A4D59DAA /* libPods-MCJSONKit_Example.a in Frameworks */,
101+
7B81934F14A75417567CA068 /* Pods_MCJSONKit_Example.framework in Frameworks */,
102102
);
103103
runOnlyForDeploymentPostprocessing = 0;
104104
};
@@ -109,7 +109,7 @@
109109
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
110110
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
111111
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
112-
C0B20416D9A80E49B8F4ED42 /* libPods-MCJSONKit_Tests.a in Frameworks */,
112+
949A4D1448E6EDFB2E7158B1 /* Pods_MCJSONKit_Tests.framework in Frameworks */,
113113
);
114114
runOnlyForDeploymentPostprocessing = 0;
115115
};
@@ -144,8 +144,8 @@
144144
6003F58F195388D20070C39A /* CoreGraphics.framework */,
145145
6003F591195388D20070C39A /* UIKit.framework */,
146146
6003F5AF195388D20070C39A /* XCTest.framework */,
147-
F13FC4735500A7B6B0F6FAA7 /* libPods-MCJSONKit_Example.a */,
148-
24EDCF03A8161914A8A24114 /* libPods-MCJSONKit_Tests.a */,
147+
06E305F5392910FF0D91D684 /* Pods_MCJSONKit_Example.framework */,
148+
940EA6A2D3A089AEC7844AF8 /* Pods_MCJSONKit_Tests.framework */,
149149
);
150150
name = Frameworks;
151151
sourceTree = "<group>";
@@ -356,11 +356,16 @@
356356
inputFileListPaths = (
357357
);
358358
inputPaths = (
359+
"${SRCROOT}/Pods/Target Support Files/Pods-MCJSONKit_Tests/Pods-MCJSONKit_Tests-frameworks.sh",
360+
"${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework",
361+
"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
359362
);
360363
name = "[CP] Embed Pods Frameworks";
361364
outputFileListPaths = (
362365
);
363366
outputPaths = (
367+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta.framework",
368+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework",
364369
);
365370
runOnlyForDeploymentPostprocessing = 0;
366371
shellPath = /bin/sh;
@@ -449,11 +454,28 @@
449454
inputFileListPaths = (
450455
);
451456
inputPaths = (
457+
"${SRCROOT}/Pods/Target Support Files/Pods-MCJSONKit_Example/Pods-MCJSONKit_Example-frameworks.sh",
458+
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
459+
"${BUILT_PRODUCTS_DIR}/MCFoundation/MCFoundation.framework",
460+
"${BUILT_PRODUCTS_DIR}/MCJSONKit/MCJSONKit.framework",
461+
"${BUILT_PRODUCTS_DIR}/MCLogger/MCLogger.framework",
462+
"${BUILT_PRODUCTS_DIR}/MCUIKit/MCUIKit.framework",
463+
"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
464+
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
465+
"${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework",
452466
);
453467
name = "[CP] Embed Pods Frameworks";
454468
outputFileListPaths = (
455469
);
456470
outputPaths = (
471+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
472+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MCFoundation.framework",
473+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MCJSONKit.framework",
474+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MCLogger.framework",
475+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MCUIKit.framework",
476+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
477+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
478+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework",
457479
);
458480
runOnlyForDeploymentPostprocessing = 0;
459481
shellPath = /bin/sh;

Example/MCJSONKit/Classes/Models/WeiboModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import <MCJSONKit/MCJSONKitDefine.h>
10+
#import <MCJSONKit/MCJSONKit.h>
1111

1212
#define MYPropMapper(name) MCProperty(name)
1313

Example/MCJSONKit/MCJSONKit-Prefix.pch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#ifdef __OBJC__
1414
@import UIKit;
1515
@import Foundation;
16-
#import <MCJSONKit/MCJSONKit.h>
1716
#import <MCLogger/MCLogger.h>
1817
#import <MCUIKit/UIColor+MCExtension.h>
1918
#import <MCUIKit/UIView+MCFrameGeometry.h>

Example/MCJSONKit/MCViewController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
//
88

99
#import "MCViewController.h"
10+
#import <MCFoundation/MCFoundation.h>
11+
#import <MCJSONKit/MCJSONKit.h>
1012

1113
@interface MCViewController ()
1214

@@ -18,6 +20,7 @@ - (void)viewDidLoad
1820
{
1921
[super viewDidLoad];
2022
// Do any additional setup after loading the view, typically from a nib.
23+
NSLog(@"%s", MCFoundationVersionString);
2124
}
2225

2326
- (void)didReceiveMemoryWarning

Example/Podfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
`rm Podfile.lock`
2+
13
platform :ios, '8.0'
2-
#use_frameworks!
4+
use_frameworks!
35

46
target 'MCJSONKit_Example' do
57
pod 'MCJSONKit', :path => '../'
@@ -11,7 +13,7 @@ target 'MCJSONKit_Example' do
1113
inherit! :search_paths
1214

1315
pod 'Specta'
14-
pod "Expecta"
16+
pod 'Expecta'
1517

1618
end
1719
end

Example/Podfile.lock

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
PODS:
2-
- CocoaLumberjack (3.3.0):
3-
- CocoaLumberjack/Default (= 3.3.0)
4-
- CocoaLumberjack/Extensions (= 3.3.0)
5-
- CocoaLumberjack/Default (3.3.0)
6-
- CocoaLumberjack/Extensions (3.3.0):
7-
- CocoaLumberjack/Default
2+
- CocoaLumberjack (3.6.0):
3+
- CocoaLumberjack/Core (= 3.6.0)
4+
- CocoaLumberjack/Core (3.6.0)
85
- Expecta (1.0.6)
9-
- MCFoundation (0.1.3)
10-
- MCJSONKit (0.5.0):
11-
- MCFoundation (~> 0.1.0)
12-
- MCLogger (0.2.5):
13-
- CocoaLumberjack (~> 3.3.0)
14-
- MCFoundation (~> 0.1.1)
6+
- MCFoundation (0.2.2)
7+
- MCJSONKit (0.5.1):
8+
- MCFoundation (~> 0.2)
9+
- MCLogger (0.6.1):
10+
- CocoaLumberjack (~> 3.0)
11+
- MJExtension (~> 3.0)
12+
- SAMKeychain (~> 1.5)
13+
- SocketRocket (~> 0.5)
1514
- MCUIKit (0.3.0):
1615
- MCUIKit/UIKit (= 0.3.0)
1716
- MCUIKit/Category (0.3.0)
1817
- MCUIKit/Gesonry (0.3.0)
1918
- MCUIKit/UIKit (0.3.0):
2019
- MCUIKit/Category
2120
- MCUIKit/Gesonry
22-
- MJExtension (3.0.13)
21+
- MJExtension (3.2.1)
22+
- SAMKeychain (1.5.3)
23+
- SocketRocket (0.5.1)
2324
- Specta (1.0.7)
2425

2526
DEPENDENCIES:
@@ -35,15 +36,17 @@ EXTERNAL SOURCES:
3536
:path: ../
3637

3738
SPEC CHECKSUMS:
38-
CocoaLumberjack: 3c8c74683302f9012bb168e1c4b7ae3c0b558431
39+
CocoaLumberjack: 78b0c238666f4f58db069738ec176f4519557516
3940
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
40-
MCFoundation: f03b2f02918ed3d8e6c30cef7ce030cf0b93f9aa
41-
MCJSONKit: 390ce31fe2b984994380125ff13382b16816e525
42-
MCLogger: f258a43a313bfeabcd85781847626a6f51e6a715
41+
MCFoundation: 1c05141cbc900ec15618d7d4c75fb88719d7b658
42+
MCJSONKit: 17415c23d77292feaec963e0bf835cc8565c225f
43+
MCLogger: baac17a212e7026585e2f1528d6de3fe548474c0
4344
MCUIKit: 4d9fb8d30b0cf44bf99605ecd248a3092d6f4e13
44-
MJExtension: 5932755f451458eefa24239358817f8d291240c7
45+
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
46+
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
47+
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
4548
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
4649

47-
PODFILE CHECKSUM: ce2bfdf4d365885b6acb263d91c0d0fdcecc998f
50+
PODFILE CHECKSUM: 061ae2c775676cfc400a9661fe66c73332f93b76
4851

4952
COCOAPODS: 1.4.0

MCJSONKit.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MCJSONKit"
3-
s.version = "0.5.0"
3+
s.version = "0.5.1"
44
s.ios.deployment_target = '8.0'
55
s.osx.deployment_target = '10.9'
66
s.summary = "A fast and convenient conversion between JSON and model"
@@ -15,5 +15,5 @@ DESC
1515
s.source_files = "MCJSONKit/Classes/**/*"
1616
s.requires_arc = true
1717

18-
s.dependency 'MCFoundation', '~> 0.1.0'
18+
s.dependency 'MCFoundation', '~> 0.2'
1919
end

MCJSONKit/Classes/MCJSONKitDefine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// MCJSONKitDefine.h
33
// MCJSONKit
44
//
5-
// Created by lingjing on 2018/6/4.
5+
// Created by Rake Yang on 2018/6/4.
66
// Copyright © 2018年 MC-Stuido. All rights reserved.
77
//
88

9-
#import <MCFoundation/MCMacros.h>
9+
#import <MCFoundation/MCFoundation.h>
1010

1111
/*
1212
属性映射,正确校验 MCProperty(name) 展开后等同于 = @"name"

0 commit comments

Comments
 (0)