Skip to content

Commit 9419381

Browse files
author
Luc Dion
authored
Merge pull request #5 from lucdion/fix_codecov2
Fix codecov2
2 parents f4b1ac4 + ab01e2e commit 9419381

File tree

5 files changed

+19
-35
lines changed

5 files changed

+19
-35
lines changed

.codeclimate.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ before_install:
1616
script:
1717
- |
1818
if [[ $SCHEME = "FlexLayout" ]]; then
19-
set -o pipefail && xcodebuild -workspace FlexLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' -enableCodeCoverage YES build test | xcpretty -f `xcpretty-travis-formatter`
19+
set -o pipefail && xcodebuild -workspace FlexLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' -enableCodeCoverage YES build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -f `xcpretty-travis-formatter`
2020
fi
2121
2222
if [[ $SCHEME = "FlexLayoutSample" ]]; then
@@ -26,5 +26,5 @@ script:
2626
after_success:
2727
- |
2828
if [[ $SCHEME = "FlexLayout" ]]; then
29-
bash <(curl -s https://codecov.io/bash) -J 'FlexLayout' -J 'FlexLayoutTests'
29+
bash <(curl -s https://codecov.io/bash) -J 'FlexLayout' -t 46f78923-637c-4f93-ac67-d494ec3ff873
3030
fi

FlexLayout.podspec

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

22
Pod::Spec.new do |s|
33
s.name = "FlexLayout"
4-
s.version = "0.8.1"
4+
s.version = "1.0.0"
55
s.summary = "FlexLayout"
66

77
s.homepage = "https://github.com/lucdion/FlexLayout.git"

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- FlexLayout (0.1.1):
2+
- FlexLayout (1.0.0):
33
- YogaKit (~> 1.6)
44
- Nimble (7.0.1)
5-
- PinLayout (1.1.6)
5+
- PinLayout (1.2.0)
66
- Quick (1.1.0)
7-
- Reveal-SDK (9)
7+
- Reveal-SDK (10)
88
- SwiftLint (0.21.0)
99
- Yoga (1.6.0)
1010
- YogaKit (1.6.0):
@@ -21,18 +21,18 @@ DEPENDENCIES:
2121

2222
EXTERNAL SOURCES:
2323
FlexLayout:
24-
:path: "./"
24+
:path: ./
2525

2626
SPEC CHECKSUMS:
27-
FlexLayout: ce97cdc111635f87749a62c9e536490de62882b9
27+
FlexLayout: ddcab20bcc85bf05df91f2337b3ddadb86ef316f
2828
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
29-
PinLayout: 21adcda909c10864b3d036664868283d7f56041c
29+
PinLayout: e5ed4089fe2d5f30e9ba689328f4304ff126c510
3030
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
31-
Reveal-SDK: d977a1ec41e7c076025c1005da6e6d7c1b8ed254
31+
Reveal-SDK: 7869ddf1f902cabbb07a1f0dd06bd25861a126f7
3232
SwiftLint: 6de8b2d15f43c482bdec2953b8cfd696faa876e8
3333
Yoga: 81670877477311136b1b3f69a6307ce62e1c89cf
3434
YogaKit: 8fe0ddd21673226c0b6077fc3ad5c8fa6cda722e
3535

3636
PODFILE CHECKSUM: 5d378ff794dc3399c62fb3e844e7bc0f1fe06b0f
3737

38-
COCOAPODS: 1.2.1
38+
COCOAPODS: 1.3.1

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
<p align="center">
2-
<a href="https://github.com/luc-dion/FlexLayout"><img src="docs/images/flexlayout-logo-2.png" alt="FlexLayout" width="270"/></a>
2+
<a href="https://github.com/lucdion/FlexLayout"><img src="docs/images/flexlayout-logo-2.png" alt="FlexLayout" width="270"/></a>
33
</p>
44

55
<h1 align="center" style="color: #376C9D; font-family: Arial Black, Gadget, sans-serif; font-size: 3em">FlexLayout</h1>
66

77
<p align="center">
88
<a href=""><img src="https://img.shields.io/cocoapods/p/FlexLayout.svg?style=flat" /></a>
9-
<a href="https://travis-ci.org/lucdion/FlexLayout"><img src="https://travis-ci.org/luc-dion/FlexLayout.svg?branch=dev" /></a>
10-
<a href="https://codecov.io/gh/lucdion/FlexLayout"><img src="https://codecov.io/gh/luc-dion/FlexLayout/branch/dev/graph/badge.svg"/></a>
9+
<a href="https://travis-ci.org/lucdion/FlexLayout"><img src="https://travis-ci.org/lucdion/FlexLayout.svg?branch=master" /></a>
10+
<a href="https://codecov.io/gh/lucdion/FlexLayout"><img src="https://codecov.io/gh/lucdion/FlexLayout/branch/master/graph/badge.svg"/></a>
1111
<a href='https://img.shields.io/cocoapods/v/FlexLayout.svg'><img src="https://img.shields.io/cocoapods/v/FlexLayout.svg" /></a>
1212
<a href="https://raw.githubusercontent.com/lucdion/FlexLayout/master/LICENSE"><img src="https://img.shields.io/badge/license-New%20BSD-blue.svg?style=flat" /></a>
13-
<!--<a href='https://dashboard.buddybuild.com/apps/5978e7ec5aa5ac00019e8e87/build/latest?branch=dev'><img src="https://dashboard.buddybuild.com/api/statusImage?appID=5978e7ec5aa5ac00019e8e87&branch=dev&build=latest"/></a>-->
1413
</p>
1514

1615
<br>
1716

18-
FlexLayout gently wraps [facebook/yoga](https://github.com/facebook/yoga) flexbox implementation in a concise, and chainable syntax.
17+
FlexLayout gently wraps the highly optimized [facebook/yoga](https://github.com/facebook/yoga) flexbox implementation in a concise, and chainable syntax.
1918

2019
### Requirements
2120
* iOS 8.0+
@@ -45,6 +44,8 @@ FlexLayout gently wraps [facebook/yoga](https://github.com/facebook/yoga) flexbo
4544

4645
<br>
4746

47+
:pushpin: FlexLayout is actively updated. So please come often to see latest changes. You can also **Star** it to be able to retrieve it easily later.
48+
4849
**FlexLayout + PinLayout**
4950

5051
<a href="https://github.com/mirego/PinLayout"><img src="docs/images/flexlayout_plus_pinlayout_small.png" alt="FlexLayout" width="250"/></a>
@@ -53,7 +54,7 @@ FlexLayout gently wraps [facebook/yoga](https://github.com/facebook/yoga) flexbo
5354

5455
PinLayout can layout anything, but in situations where you need to layouts many views without requiring the finest control, FlexLayout is best fitted.
5556

56-
A view layouted using PinLayout can be embedded inside a FlexLayout's flexbox container and reversely PinLayout can layout a FlexLayout view.
57+
A view layouted using PinLayout can be embedded inside a FlexLayout's flexbox container and reversely PinLayout can layout a FlexLayout view. You choose the best layout framework for your situation.
5758

5859
<br>
5960

@@ -878,7 +879,7 @@ Then, run `pod install`.
878879
<br/>
879880

880881
## Contributing, comments, ideas, suggestions, issues, .... <a name="comments"></a>
881-
For any **comments**, **ideas**, **suggestions**, simply open an [issue](https://github.com/luc-dion/FlexLayout/issues).
882+
For any **comments**, **ideas**, **suggestions**, simply open an [issue](https://github.com/lucdion/FlexLayout/issues).
882883

883884
For **issues**, please have a look at [Yoga's issues](https://github.com/facebook/yoga/issues). Your issue may have been already reported. If not, it may be a FlexLayout issue. In this case open an issue and we'll let you know if the issue is related to Yoga's implementation.
884885

0 commit comments

Comments
 (0)