Skip to content

Commit 5d7c159

Browse files
muukiimuukii
committed
Fix demo
1 parent 58cc6d2 commit 5d7c159

File tree

4 files changed

+74
-70
lines changed

4 files changed

+74
-70
lines changed

‎demo/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# frozen_string_literal: true
33
source "https://rubygems.org"
44

5-
gem 'cocoapods', '1.6.1'
5+
gem 'cocoapods', '1.10.0'
66
gem 'cocoapods-binary', :path => "../"
77
gem 'xcpretty'

‎demo/Gemfile.lock

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,81 +9,98 @@ PATH
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
CFPropertyList (3.0.0)
13-
activesupport (4.2.11.1)
14-
i18n (~> 0.7)
12+
CFPropertyList (3.0.3)
13+
activesupport (5.2.4.4)
14+
concurrent-ruby (~> 1.0, >= 1.0.2)
15+
i18n (>= 0.7, < 2)
1516
minitest (~> 5.1)
16-
thread_safe (~> 0.3, >= 0.3.4)
1717
tzinfo (~> 1.1)
18+
addressable (2.7.0)
19+
public_suffix (>= 2.0.2, < 5.0)
20+
algoliasearch (1.27.5)
21+
httpclient (~> 2.8, >= 2.8.3)
22+
json (>= 1.5.1)
1823
atomos (0.1.3)
19-
claide (1.0.2)
20-
cocoapods (1.6.1)
21-
activesupport (>= 4.0.2, < 5)
24+
claide (1.0.3)
25+
cocoapods (1.10.0)
26+
addressable (~> 2.6)
2227
claide (>= 1.0.2, < 2.0)
23-
cocoapods-core (= 1.6.1)
24-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
25-
cocoapods-downloader (>= 1.2.2, < 2.0)
28+
cocoapods-core (= 1.10.0)
29+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
30+
cocoapods-downloader (>= 1.4.0, < 2.0)
2631
cocoapods-plugins (>= 1.0.0, < 2.0)
2732
cocoapods-search (>= 1.0.0, < 2.0)
28-
cocoapods-stats (>= 1.0.0, < 2.0)
29-
cocoapods-trunk (>= 1.3.1, < 2.0)
33+
cocoapods-trunk (>= 1.4.0, < 2.0)
3034
cocoapods-try (>= 1.1.0, < 2.0)
3135
colored2 (~> 3.1)
3236
escape (~> 0.0.4)
33-
fourflusher (>= 2.2.0, < 3.0)
37+
fourflusher (>= 2.3.0, < 3.0)
3438
gh_inspector (~> 1.0)
3539
molinillo (~> 0.6.6)
3640
nap (~> 1.0)
3741
ruby-macho (~> 1.4)
38-
xcodeproj (>= 1.8.1, < 2.0)
39-
cocoapods-core (1.6.1)
40-
activesupport (>= 4.0.2, < 6)
42+
xcodeproj (>= 1.19.0, < 2.0)
43+
cocoapods-core (1.10.0)
44+
activesupport (> 5.0, < 6)
45+
addressable (~> 2.6)
46+
algoliasearch (~> 1.0)
47+
concurrent-ruby (~> 1.1)
4148
fuzzy_match (~> 2.0.4)
4249
nap (~> 1.0)
50+
netrc (~> 0.11)
51+
public_suffix
52+
typhoeus (~> 1.0)
4353
cocoapods-deintegrate (1.0.4)
44-
cocoapods-downloader (1.2.2)
54+
cocoapods-downloader (1.4.0)
4555
cocoapods-plugins (1.0.0)
4656
nap
4757
cocoapods-search (1.0.0)
48-
cocoapods-stats (1.1.0)
49-
cocoapods-trunk (1.3.1)
58+
cocoapods-trunk (1.5.0)
5059
nap (>= 0.8, < 2.0)
5160
netrc (~> 0.11)
52-
cocoapods-try (1.1.0)
61+
cocoapods-try (1.2.0)
5362
colored2 (3.1.2)
54-
concurrent-ruby (1.1.5)
63+
concurrent-ruby (1.1.7)
5564
escape (0.0.4)
56-
fourflusher (2.2.0)
65+
ethon (0.12.0)
66+
ffi (>= 1.3.0)
67+
ffi (1.13.1)
68+
fourflusher (2.3.1)
5769
fuzzy_match (2.0.4)
5870
gh_inspector (1.1.3)
59-
i18n (0.9.5)
71+
httpclient (2.8.3)
72+
i18n (1.8.5)
6073
concurrent-ruby (~> 1.0)
61-
minitest (5.11.3)
74+
json (2.3.1)
75+
minitest (5.14.2)
6276
molinillo (0.6.6)
63-
nanaimo (0.2.6)
77+
nanaimo (0.3.0)
6478
nap (1.1.0)
6579
netrc (0.11.0)
80+
public_suffix (4.0.6)
6681
rouge (2.0.7)
6782
ruby-macho (1.4.0)
6883
thread_safe (0.3.6)
69-
tzinfo (1.2.5)
84+
typhoeus (1.4.0)
85+
ethon (>= 0.9.0)
86+
tzinfo (1.2.8)
7087
thread_safe (~> 0.1)
71-
xcodeproj (1.8.2)
88+
xcodeproj (1.19.0)
7289
CFPropertyList (>= 2.3.3, < 4.0)
7390
atomos (~> 0.1.3)
7491
claide (>= 1.0.2, < 2.0)
7592
colored2 (~> 3.1)
76-
nanaimo (~> 0.2.6)
93+
nanaimo (~> 0.3.0)
7794
xcpretty (0.3.0)
7895
rouge (~> 2.0.7)
7996

8097
PLATFORMS
8198
ruby
8299

83100
DEPENDENCIES
84-
cocoapods (= 1.6.1)
101+
cocoapods (= 1.10.0)
85102
cocoapods-binary!
86103
xcpretty
87104

88105
BUNDLED WITH
89-
2.0.1
106+
2.1.4

‎demo/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ DEPENDENCIES:
55
- Masonry
66

77
SPEC REPOS:
8-
https://github.com/cocoapods/specs.git:
8+
trunk:
99
- Masonry
1010

1111
SPEC CHECKSUMS:
1212
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
1313

1414
PODFILE CHECKSUM: 5daab9dbab4736d6a1b3df2ffa8d856285c16553
1515

16-
COCOAPODS: 1.6.1
16+
COCOAPODS: 1.10.0

‎demo/demo.xcodeproj/project.pbxproj

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,36 @@
88

99
/* Begin PBXBuildFile section */
1010
2E1AEA2ADE0B2C6D0E8CB73C /* BDWebImage_demo.m in Sources */ = {isa = PBXBuildFile; fileRef = 89A7B09D8E1B9A5928206B3D /* BDWebImage_demo.m */; };
11-
7ADC04F6B6AD86B4711FC662 /* Pods_demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0282097ED33E34DF2FB40193 /* Pods_demo.framework */; };
11+
4E7F0A1DEF72401732631637 /* Pods_demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 044EC92A39312500E33210F0 /* Pods_demo.framework */; };
1212
8BC2E4C8225F2B8600EC0609 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC2E4C7225F2B8600EC0609 /* AppDelegate.swift */; };
1313
8BC2E4CA225F2B8600EC0609 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC2E4C9225F2B8600EC0609 /* ViewController.swift */; };
1414
8BC2E4D2225F2B8700EC0609 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BC2E4D0225F2B8700EC0609 /* LaunchScreen.storyboard */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
18-
0282097ED33E34DF2FB40193 /* Pods_demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
19-
6F9AD13F2ED88EAB7A9128D7 /* libPods-demoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-demoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
18+
044EC92A39312500E33210F0 /* Pods_demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
19+
4CF2798C779A4B1DB1ED95EA /* Pods-demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.release.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.release.xcconfig"; sourceTree = "<group>"; };
2020
89A7B09D8E1B9A5928206B3D /* BDWebImage_demo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BDWebImage_demo.m; sourceTree = "<group>"; };
2121
8BC2E4C4225F2B8600EC0609 /* demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
2222
8BC2E4C7225F2B8600EC0609 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2323
8BC2E4C9225F2B8600EC0609 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
2424
8BC2E4D1225F2B8700EC0609 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
2525
8BC2E4D3225F2B8700EC0609 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
26-
9A8064F1F3E5738D234C80E2 /* Pods-demoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demoTests.release.xcconfig"; path = "Target Support Files/Pods-demoTests/Pods-demoTests.release.xcconfig"; sourceTree = "<group>"; };
27-
C55F7BF03CC970F91505F490 /* Pods-demoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demoTests.debug.xcconfig"; path = "Target Support Files/Pods-demoTests/Pods-demoTests.debug.xcconfig"; sourceTree = "<group>"; };
28-
E9C2707150376AA5D63E8BAE /* Pods-demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.release.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.release.xcconfig"; sourceTree = "<group>"; };
29-
F8A8B289BFEAE54B0D540472 /* Pods-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.debug.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.debug.xcconfig"; sourceTree = "<group>"; };
26+
D04236F5B998AFD90E6F891E /* Pods-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.debug.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.debug.xcconfig"; sourceTree = "<group>"; };
3027
/* End PBXFileReference section */
3128

3229
/* Begin PBXFrameworksBuildPhase section */
3330
8BC2E4C1225F2B8600EC0609 /* Frameworks */ = {
3431
isa = PBXFrameworksBuildPhase;
3532
buildActionMask = 2147483647;
3633
files = (
37-
7ADC04F6B6AD86B4711FC662 /* Pods_demo.framework in Frameworks */,
34+
4E7F0A1DEF72401732631637 /* Pods_demo.framework in Frameworks */,
3835
);
3936
runOnlyForDeploymentPostprocessing = 0;
4037
};
4138
/* End PBXFrameworksBuildPhase section */
4239

4340
/* Begin PBXGroup section */
44-
03BCE6F733E8AF8755385CE8 /* Frameworks */ = {
45-
isa = PBXGroup;
46-
children = (
47-
6F9AD13F2ED88EAB7A9128D7 /* libPods-demoTests.a */,
48-
0282097ED33E34DF2FB40193 /* Pods_demo.framework */,
49-
);
50-
name = Frameworks;
51-
sourceTree = "<group>";
52-
};
5341
48064E0CABFB2B206E032E3B /* demos */ = {
5442
isa = PBXGroup;
5543
children = (
@@ -65,7 +53,7 @@
6553
8BC2E4C6225F2B8600EC0609 /* demo */,
6654
8BC2E4C5225F2B8600EC0609 /* Products */,
6755
D25B1A678978B02ABFF01D1C /* Pods */,
68-
03BCE6F733E8AF8755385CE8 /* Frameworks */,
56+
F46AC028BDE2AFC77F39ED2B /* Frameworks */,
6957
);
7058
sourceTree = "<group>";
7159
};
@@ -92,26 +80,32 @@
9280
D25B1A678978B02ABFF01D1C /* Pods */ = {
9381
isa = PBXGroup;
9482
children = (
95-
F8A8B289BFEAE54B0D540472 /* Pods-demo.debug.xcconfig */,
96-
E9C2707150376AA5D63E8BAE /* Pods-demo.release.xcconfig */,
97-
C55F7BF03CC970F91505F490 /* Pods-demoTests.debug.xcconfig */,
98-
9A8064F1F3E5738D234C80E2 /* Pods-demoTests.release.xcconfig */,
83+
D04236F5B998AFD90E6F891E /* Pods-demo.debug.xcconfig */,
84+
4CF2798C779A4B1DB1ED95EA /* Pods-demo.release.xcconfig */,
9985
);
10086
path = Pods;
10187
sourceTree = "<group>";
10288
};
89+
F46AC028BDE2AFC77F39ED2B /* Frameworks */ = {
90+
isa = PBXGroup;
91+
children = (
92+
044EC92A39312500E33210F0 /* Pods_demo.framework */,
93+
);
94+
name = Frameworks;
95+
sourceTree = "<group>";
96+
};
10397
/* End PBXGroup section */
10498

10599
/* Begin PBXNativeTarget section */
106100
8BC2E4C3225F2B8600EC0609 /* demo */ = {
107101
isa = PBXNativeTarget;
108102
buildConfigurationList = 8BC2E4E1225F2B8800EC0609 /* Build configuration list for PBXNativeTarget "demo" */;
109103
buildPhases = (
110-
4A7278B702427200DBDC45CB /* [CP] Check Pods Manifest.lock */,
104+
81ED7638A0CD08711B1D7EB7 /* [CP] Check Pods Manifest.lock */,
111105
8BC2E4C0225F2B8600EC0609 /* Sources */,
112106
8BC2E4C1225F2B8600EC0609 /* Frameworks */,
113107
8BC2E4C2225F2B8600EC0609 /* Resources */,
114-
27E132FE722A29856F619A3D /* [CP] Embed Pods Frameworks */,
108+
5801A456D772620A7851D8CB /* [CP] Embed Pods Frameworks */,
115109
);
116110
buildRules = (
117111
);
@@ -167,31 +161,24 @@
167161
/* End PBXResourcesBuildPhase section */
168162

169163
/* Begin PBXShellScriptBuildPhase section */
170-
27E132FE722A29856F619A3D /* [CP] Embed Pods Frameworks */ = {
164+
5801A456D772620A7851D8CB /* [CP] Embed Pods Frameworks */ = {
171165
isa = PBXShellScriptBuildPhase;
172166
buildActionMask = 2147483647;
173167
files = (
174168
);
175169
inputFileListPaths = (
176-
);
177-
inputPaths = (
178-
"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks.sh",
179-
"${PODS_ROOT}/Masonry/Masonry.framework",
180-
"${PODS_ROOT}/Masonry/Masonry.framework.dSYM",
170+
"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
181171
);
182172
name = "[CP] Embed Pods Frameworks";
183173
outputFileListPaths = (
184-
);
185-
outputPaths = (
186-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
187-
"${DWARF_DSYM_FOLDER_PATH}/Masonry.framework.dSYM",
174+
"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
188175
);
189176
runOnlyForDeploymentPostprocessing = 0;
190177
shellPath = /bin/sh;
191178
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks.sh\"\n";
192179
showEnvVarsInLog = 0;
193180
};
194-
4A7278B702427200DBDC45CB /* [CP] Check Pods Manifest.lock */ = {
181+
81ED7638A0CD08711B1D7EB7 /* [CP] Check Pods Manifest.lock */ = {
195182
isa = PBXShellScriptBuildPhase;
196183
buildActionMask = 2147483647;
197184
files = (
@@ -358,7 +345,7 @@
358345
};
359346
8BC2E4E2225F2B8800EC0609 /* Debug */ = {
360347
isa = XCBuildConfiguration;
361-
baseConfigurationReference = F8A8B289BFEAE54B0D540472 /* Pods-demo.debug.xcconfig */;
348+
baseConfigurationReference = D04236F5B998AFD90E6F891E /* Pods-demo.debug.xcconfig */;
362349
buildSettings = {
363350
CODE_SIGN_STYLE = Automatic;
364351
INFOPLIST_FILE = demo/Info.plist;
@@ -375,7 +362,7 @@
375362
};
376363
8BC2E4E3225F2B8800EC0609 /* Release */ = {
377364
isa = XCBuildConfiguration;
378-
baseConfigurationReference = E9C2707150376AA5D63E8BAE /* Pods-demo.release.xcconfig */;
365+
baseConfigurationReference = 4CF2798C779A4B1DB1ED95EA /* Pods-demo.release.xcconfig */;
379366
buildSettings = {
380367
CODE_SIGN_STYLE = Automatic;
381368
INFOPLIST_FILE = demo/Info.plist;

0 commit comments

Comments
 (0)