Skip to content

Commit aff2812

Browse files
authored
Merge pull request #49 from layoutBox/add_margin_percent_methods
Add margins methods taking percentage parameters
2 parents 48665cc + 13d7591 commit aff2812

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2787
-205
lines changed

.gitignore

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# Xcode
22
#
33

4+
.versions
45
.build/
5-
build/
66
xcuserdata
77
Data/
88
Pods/
9-
Carthage/
9+
FlexLayout.xcodeproj/project.xcworkspace/xcuserdata
10+
11+
# Carthage
12+
Carthage/Build/.*.version
13+
Carthage/Build/iOS/*.dSYM
14+
Carthage/Build/iOS/*.bcsymbolmap
15+
Carthage/Build/tvOS
16+
Carthage/Checkouts

.swiftlint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ disabled_rules: # rule identifiers to exclude from running
2222

2323
excluded: # paths to ignore during linting. overridden by `included`.
2424
- Pods
25+
- Carthage
26+
- fastlane

.travis.yml

+7-21
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
11
language: objective-c
2-
osx_image: xcode9.2
3-
4-
env:
5-
matrix:
6-
- SCHEME=FlexLayout SDK=iphonesimulator11.2
7-
- SCHEME=FlexLayout SDK=iphonesimulator10.3
8-
- SCHEME=FlexLayoutSample SDK=iphonesimulator11.2
2+
osx_image: xcode9.2
93

104
before_install:
11-
- rvm use $RVM_RUBY_VERSION
12-
# - bundle install
5+
# - rvm use $RVM_RUBY_VERSION
6+
- bundle install
137
- gem install xcpretty-travis-formatter;
14-
- gem install cocoapods -v '1.3.1' --no-document --quiet;
15-
- gem install slather --no-document --quiet;
16-
- pod install --repo-update;
8+
#- gem install cocoapods -v '1.3.1' --no-document --quiet;
9+
# - gem install slather --no-document --quiet;
10+
#- pod install --repo-update;
1711
# - carthage bootstrap --verbose --platform iOS --cache-builds --use-ssh
1812

1913
script:
20-
- |
21-
if [[ $SCHEME = "FlexLayout" ]]; then
22-
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`
23-
fi
24-
25-
if [[ $SCHEME = "FlexLayoutSample" ]]; then
26-
set -o pipefail && xcodebuild -workspace FlexLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
27-
fi
14+
- set -o pipefail && bundle exec fastlane travis
2815

2916
after_success:
3017
- bash <(curl -s https://codecov.io/bash) -J 'FlexLayout' -J 'FlexLayoutTests'
31-

Carthage/Build/iOS/Nimble.framework/Headers/CwlCatchException.h

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Carthage/Build/iOS/Nimble.framework/Headers/CwlMachBadInstructionHandler.h

+70
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Carthage/Build/iOS/Nimble.framework/Headers/CwlPreconditionTesting.h

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)