Skip to content
This repository was archived by the owner on Dec 13, 2017. It is now read-only.

Commit 61db829

Browse files
SergioEstevaoSergioEstevao
committed
Merge branch 'release/1.7.1' into develop
2 parents 9e19f03 + 73ea91c commit 61db829

10 files changed

Lines changed: 50 additions & 37 deletions

File tree

‎Example/EditorDemo.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@
225225
isa = PBXNativeTarget;
226226
buildConfigurationList = 748D2ABA193E516000D5ACC8 /* Build configuration list for PBXNativeTarget "EditorDemo" */;
227227
buildPhases = (
228-
6CE9E7A78A7D2DBBC1BC238B /* 📦 Check Pods Manifest.lock */,
228+
6CE9E7A78A7D2DBBC1BC238B /* [CP] Check Pods Manifest.lock */,
229229
748D2A81193E516000D5ACC8 /* Sources */,
230230
748D2A82193E516000D5ACC8 /* Frameworks */,
231231
748D2A83193E516000D5ACC8 /* Resources */,
232-
4695D4EE8336F768836ED41D /* 📦 Embed Pods Frameworks */,
233-
170B864A8E43A234A08171F5 /* 📦 Copy Pods Resources */,
232+
4695D4EE8336F768836ED41D /* [CP] Embed Pods Frameworks */,
233+
170B864A8E43A234A08171F5 /* [CP] Copy Pods Resources */,
234234
);
235235
buildRules = (
236236
);
@@ -245,12 +245,12 @@
245245
isa = PBXNativeTarget;
246246
buildConfigurationList = 748D2ABD193E516000D5ACC8 /* Build configuration list for PBXNativeTarget "EditorDemoTests" */;
247247
buildPhases = (
248-
19DDA6B0A0EAF45D6723B64A /* 📦 Check Pods Manifest.lock */,
248+
19DDA6B0A0EAF45D6723B64A /* [CP] Check Pods Manifest.lock */,
249249
748D2AA5193E516000D5ACC8 /* Sources */,
250250
748D2AA6193E516000D5ACC8 /* Frameworks */,
251251
748D2AA7193E516000D5ACC8 /* Resources */,
252-
62F4CCED3A7DBAC3DE4D56EA /* 📦 Embed Pods Frameworks */,
253-
D3F5DB2B0020A9B77E64179A /* 📦 Copy Pods Resources */,
252+
62F4CCED3A7DBAC3DE4D56EA /* [CP] Embed Pods Frameworks */,
253+
D3F5DB2B0020A9B77E64179A /* [CP] Copy Pods Resources */,
254254
);
255255
buildRules = (
256256
);
@@ -324,89 +324,89 @@
324324
/* End PBXResourcesBuildPhase section */
325325

326326
/* Begin PBXShellScriptBuildPhase section */
327-
170B864A8E43A234A08171F5 /* 📦 Copy Pods Resources */ = {
327+
170B864A8E43A234A08171F5 /* [CP] Copy Pods Resources */ = {
328328
isa = PBXShellScriptBuildPhase;
329329
buildActionMask = 2147483647;
330330
files = (
331331
);
332332
inputPaths = (
333333
);
334-
name = "📦 Copy Pods Resources";
334+
name = "[CP] Copy Pods Resources";
335335
outputPaths = (
336336
);
337337
runOnlyForDeploymentPostprocessing = 0;
338338
shellPath = /bin/sh;
339339
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EditorDemo/Pods-EditorDemo-resources.sh\"\n";
340340
showEnvVarsInLog = 0;
341341
};
342-
19DDA6B0A0EAF45D6723B64A /* 📦 Check Pods Manifest.lock */ = {
342+
19DDA6B0A0EAF45D6723B64A /* [CP] Check Pods Manifest.lock */ = {
343343
isa = PBXShellScriptBuildPhase;
344344
buildActionMask = 2147483647;
345345
files = (
346346
);
347347
inputPaths = (
348348
);
349-
name = "📦 Check Pods Manifest.lock";
349+
name = "[CP] Check Pods Manifest.lock";
350350
outputPaths = (
351351
);
352352
runOnlyForDeploymentPostprocessing = 0;
353353
shellPath = /bin/sh;
354354
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
355355
showEnvVarsInLog = 0;
356356
};
357-
4695D4EE8336F768836ED41D /* 📦 Embed Pods Frameworks */ = {
357+
4695D4EE8336F768836ED41D /* [CP] Embed Pods Frameworks */ = {
358358
isa = PBXShellScriptBuildPhase;
359359
buildActionMask = 2147483647;
360360
files = (
361361
);
362362
inputPaths = (
363363
);
364-
name = "📦 Embed Pods Frameworks";
364+
name = "[CP] Embed Pods Frameworks";
365365
outputPaths = (
366366
);
367367
runOnlyForDeploymentPostprocessing = 0;
368368
shellPath = /bin/sh;
369369
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EditorDemo/Pods-EditorDemo-frameworks.sh\"\n";
370370
showEnvVarsInLog = 0;
371371
};
372-
62F4CCED3A7DBAC3DE4D56EA /* 📦 Embed Pods Frameworks */ = {
372+
62F4CCED3A7DBAC3DE4D56EA /* [CP] Embed Pods Frameworks */ = {
373373
isa = PBXShellScriptBuildPhase;
374374
buildActionMask = 2147483647;
375375
files = (
376376
);
377377
inputPaths = (
378378
);
379-
name = "📦 Embed Pods Frameworks";
379+
name = "[CP] Embed Pods Frameworks";
380380
outputPaths = (
381381
);
382382
runOnlyForDeploymentPostprocessing = 0;
383383
shellPath = /bin/sh;
384384
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EditorDemoTests/Pods-EditorDemoTests-frameworks.sh\"\n";
385385
showEnvVarsInLog = 0;
386386
};
387-
6CE9E7A78A7D2DBBC1BC238B /* 📦 Check Pods Manifest.lock */ = {
387+
6CE9E7A78A7D2DBBC1BC238B /* [CP] Check Pods Manifest.lock */ = {
388388
isa = PBXShellScriptBuildPhase;
389389
buildActionMask = 2147483647;
390390
files = (
391391
);
392392
inputPaths = (
393393
);
394-
name = "📦 Check Pods Manifest.lock";
394+
name = "[CP] Check Pods Manifest.lock";
395395
outputPaths = (
396396
);
397397
runOnlyForDeploymentPostprocessing = 0;
398398
shellPath = /bin/sh;
399399
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
400400
showEnvVarsInLog = 0;
401401
};
402-
D3F5DB2B0020A9B77E64179A /* 📦 Copy Pods Resources */ = {
402+
D3F5DB2B0020A9B77E64179A /* [CP] Copy Pods Resources */ = {
403403
isa = PBXShellScriptBuildPhase;
404404
buildActionMask = 2147483647;
405405
files = (
406406
);
407407
inputPaths = (
408408
);
409-
name = "📦 Copy Pods Resources";
409+
name = "[CP] Copy Pods Resources";
410410
outputPaths = (
411411
);
412412
runOnlyForDeploymentPostprocessing = 0;

‎Example/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ PODS:
88
- CocoaLumberjack/Extensions (2.2.0):
99
- CocoaLumberjack/Default
1010
- NSObject-SafeExpectations (0.0.2)
11-
- WordPress-iOS-Editor (1.7):
11+
- WordPress-iOS-Editor (1.7.1):
1212
- CocoaLumberjack (~> 2.2.0)
1313
- NSObject-SafeExpectations (~> 0.0.2)
1414
- WordPressCom-Analytics-iOS (~> 0.1.0)
1515
- WordPress-iOS-Shared (0.5.9):
1616
- CocoaLumberjack (~> 2.2.0)
17-
- WordPressCom-Analytics-iOS (0.1.11)
17+
- WordPressCom-Analytics-iOS (0.1.15)
1818

1919
DEPENDENCIES:
2020
- CocoaLumberjack (~> 2.2.0)
@@ -29,10 +29,10 @@ EXTERNAL SOURCES:
2929
SPEC CHECKSUMS:
3030
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
3131
NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
32-
WordPress-iOS-Editor: 973cfd00f5ceea89d9337ae7be7c59144931edef
32+
WordPress-iOS-Editor: fce34a1b53e1c97862817dea815f3f7cc697534c
3333
WordPress-iOS-Shared: 50a7bd7056b8721e86c3cbe167eab49ef85ec07b
34-
WordPressCom-Analytics-iOS: a844ac791b2627dbb64ba62090654f43dd2abc1c
34+
WordPressCom-Analytics-iOS: e1a7111255e98561c4b5a33ef4baa75a68e0d5d3
3535

3636
PODFILE CHECKSUM: 33e0b5312e2d220c5a6e0e29251cbd5cd92f03e1
3737

38-
COCOAPODS: 1.0.0
38+
COCOAPODS: 1.0.1

‎Example/Pods/Local Podspecs/WordPress-iOS-Editor.podspec.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Manifest.lock‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/Pods-EditorDemo/Pods-EditorDemo-resources.sh‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/Pods-EditorDemoTests/Pods-EditorDemoTests-resources.sh‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/WordPress-iOS-Editor/Info.plist‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/WordPressCom-Analytics-iOS/Info.plist‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/WordPressCom-Analytics-iOS/WordPressCom-Analytics-iOS/WPAnalytics.h‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WordPress-iOS-Editor.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPress-iOS-Editor"
3-
s.version = "1.7"
3+
s.version = "1.7.1"
44
s.summary = "Reusable component rich text editor for WordPress.com in an iOS application."
55

66
s.description = <<-DESC

0 commit comments

Comments
 (0)