Skip to content

Commit cb86e1c

Browse files
authored
Merge pull request #77 from layoutBox/update_license_and_cocoapod
Update Cocoapod to 1.5 and change the license to MIT
2 parents 782bf55 + 122826d commit cb86e1c

File tree

15 files changed

+63
-82
lines changed

15 files changed

+63
-82
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ Carthage/Checkouts
2121
/.buckconfig.local
2222
/.buckd
2323
/gentest/test.html
24-
.buckversion
24+
.buckversion
25+
26+
fastlane/report.xml
27+
fastlane/test_output

Example/FlexLayoutSample.xcodeproj/project.pbxproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@
351351
DF1F2A181F17D11700BA1B97 /* Resources */,
352352
DF1F2A1B1F17D11700BA1B97 /* Embed Frameworks */,
353353
DF1F2A1C1F17D11700BA1B97 /* [CP] Embed Pods Frameworks */,
354-
DF1F2A1D1F17D11700BA1B97 /* [CP] Copy Pods Resources */,
355354
DF1F2A1E1F17D11700BA1B97 /* Run Swiftlint */,
356355
);
357356
buildRules = (
@@ -445,21 +444,6 @@
445444
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh\"\n";
446445
showEnvVarsInLog = 0;
447446
};
448-
DF1F2A1D1F17D11700BA1B97 /* [CP] Copy Pods Resources */ = {
449-
isa = PBXShellScriptBuildPhase;
450-
buildActionMask = 2147483647;
451-
files = (
452-
);
453-
inputPaths = (
454-
);
455-
name = "[CP] Copy Pods Resources";
456-
outputPaths = (
457-
);
458-
runOnlyForDeploymentPostprocessing = 0;
459-
shellPath = /bin/sh;
460-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-resources.sh\"\n";
461-
showEnvVarsInLog = 0;
462-
};
463447
DF1F2A1E1F17D11700BA1B97 /* Run Swiftlint */ = {
464448
isa = PBXShellScriptBuildPhase;
465449
buildActionMask = 2147483647;

Example/FlexLayoutSample/UI/Examples/Example1/Example1View.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class Example1View: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
let view1 = BasicView(text: "View 1")
2627
let view2 = BasicView(text: "View 2")

Example/FlexLayoutSample/UI/Examples/Intro/IntroView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class IntroView: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
let imageView = UIImageView(image: UIImage(named: "flexlayout-logo"))
2627

Example/FlexLayoutSample/UI/Examples/YogaExampleA/YogaExampleAView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class YogaExampleAView: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
// Yoga's C Example
2627
rootFlexContainer.flex.direction(.row).padding(20).define { (flex) in

Example/FlexLayoutSample/UI/Examples/YogaExampleB/YogaExampleBView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class YogaExampleBView: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
let imageView = UIView()
2627
imageView.backgroundColor = .flexLayoutColor

Example/FlexLayoutSample/UI/Examples/YogaExampleC/YogaExampleCView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class YogaExampleCView: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
let label = UIView()
2627
label.backgroundColor = .black

Example/FlexLayoutSample/UI/Examples/YogaExampleD/YogaExampleDView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class YogaExampleDView: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
let imageView = UIView()
2627
imageView.backgroundColor = .flexLayoutColor

Example/FlexLayoutSample/UI/Examples/YogaExampleE/YogaExampleEView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class YogaExampleEView: UIView {
2121

2222
init() {
2323
super.init(frame: .zero)
24+
backgroundColor = .white
2425

2526
let imageView = UIView()
2627
imageView.backgroundColor = .flexLayoutColor

FlexLayout.xcodeproj/project.pbxproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@
306306
6AA61EBD9B5B3C3BFCBC353F /* [CP] Check Pods Manifest.lock */,
307307
24DA375F1EF843C500D1AB2F /* Sources */,
308308
24DA37601EF843C500D1AB2F /* Frameworks */,
309-
6CAD7AF75EFAC45BB7600E90 /* [CP] Copy Pods Resources */,
310309
AE3D984F700B529A3E1CA66E /* [CP] Embed Pods Frameworks */,
311310
);
312311
buildRules = (
@@ -388,21 +387,6 @@
388387
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
389388
showEnvVarsInLog = 0;
390389
};
391-
6CAD7AF75EFAC45BB7600E90 /* [CP] Copy Pods Resources */ = {
392-
isa = PBXShellScriptBuildPhase;
393-
buildActionMask = 2147483647;
394-
files = (
395-
);
396-
inputPaths = (
397-
);
398-
name = "[CP] Copy Pods Resources";
399-
outputPaths = (
400-
);
401-
runOnlyForDeploymentPostprocessing = 0;
402-
shellPath = /bin/sh;
403-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-resources.sh\"\n";
404-
showEnvVarsInLog = 0;
405-
};
406390
AE3D984F700B529A3E1CA66E /* [CP] Embed Pods Frameworks */ = {
407391
isa = PBXShellScriptBuildPhase;
408392
buildActionMask = 2147483647;

0 commit comments

Comments
 (0)