Skip to content

Commit 8fe4f44

Browse files
authored
Merge pull request #122 from mirego/add_pinFrame
Add pin frame
2 parents 6141826 + b124020 commit 8fe4f44

22 files changed

+446
-202
lines changed

.travis.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: objective-c
22
osx_image: xcode9.2
33

4-
env:
5-
matrix:
6-
- SCHEME=PinLayout SDK=iphonesimulator11.2
4+
#env:
5+
#matrix:
6+
#- SCHEME=PinLayout SDK=iphonesimulator11.2
77
#- SCHEME=PinLayout SDK=iphonesimulator10.3
88
#- SCHEME=PinLayoutSample SDK=iphonesimulator11.2
99
#- SCHEME=PinLayoutTVOS SDK=appletvsimulator11.0
@@ -16,11 +16,12 @@ before_install:
1616
- pod install --repo-update;
1717

1818
script:
19-
- |
20-
if [[ $SCHEME = "PinLayout" ]]; then
21-
set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' -enableCodeCoverage YES build test | xcpretty -f `xcpretty-travis-formatter`
22-
bundle exec fastlane travis
23-
fi
19+
- set -o pipefail && bundle exec fastlane travis
20+
#- |
21+
#if [[ $SCHEME = "PinLayout" ]]; then
22+
#set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' -enableCodeCoverage YES build test | xcpretty -f `xcpretty-travis-formatter`
23+
# bundle exec fastlane travis
24+
#fi
2425

2526
#if [[ $SCHEME = "PinLayoutSample" ]]; then
2627
# set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
@@ -31,7 +32,7 @@ script:
3132
#fi
3233

3334
after_success:
34-
- |
35-
if [[ $SCHEME = "PinLayout" ]]; then
36-
bash <(curl -s https://codecov.io/bash) -J 'PinLayout' -J 'PinLayoutTests'
37-
fi
35+
# - |
36+
# if [[ $SCHEME = "PinLayout" ]]; then
37+
bash <(curl -s https://codecov.io/bash) -J 'PinLayout' -J 'PinLayoutTests'
38+
# fi

Example/PinLayoutSample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,12 @@
520520
);
521521
inputPaths = (
522522
"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh",
523+
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
523524
"${PODS_ROOT}/Reveal-SDK/RevealServer-10/iOS/RevealServer.framework",
524525
);
525526
name = "[CP] Embed Pods Frameworks";
526527
outputPaths = (
528+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
527529
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
528530
);
529531
runOnlyForDeploymentPostprocessing = 0;

PinLayout.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
249EFE891E64FB4C00165E39 /* PinLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 249EFE881E64FB4C00165E39 /* PinLayoutTests.swift */; };
5151
24B02B091F2A713000C18179 /* PinLayout+Filters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24949A2D1EF69474003643D3 /* PinLayout+Filters.swift */; };
5252
24B02B0A1F2A713300C18179 /* PinLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFC97CA61E8A8F2C001545D5 /* PinLayout.swift */; };
53-
24BBE6351F50FA1D0091D5E9 /* UnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBE6341F50FA1D0091D5E9 /* UnitTests.swift */; };
54-
24BBE6381F52EC380091D5E9 /* UnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBE6341F50FA1D0091D5E9 /* UnitTests.swift */; };
5553
24D18D171F3B4381008129EF /* RTLSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D18D151F3B42E0008129EF /* RTLSpec.swift */; };
5654
24D18D241F3E37DD008129EF /* Pin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D18D231F3E37DD008129EF /* Pin.swift */; };
5755
24D18D261F3E5EA5008129EF /* Pin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D18D231F3E37DD008129EF /* Pin.swift */; };
@@ -121,7 +119,6 @@
121119
249EFE831E64FB4C00165E39 /* PinLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PinLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
122120
249EFE881E64FB4C00165E39 /* PinLayoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinLayoutTests.swift; sourceTree = "<group>"; };
123121
249EFE8A1E64FB4C00165E39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
124-
24BBE6341F50FA1D0091D5E9 /* UnitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UnitTests.swift; path = Impl/UnitTests.swift; sourceTree = "<group>"; };
125122
24D18D151F3B42E0008129EF /* RTLSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTLSpec.swift; sourceTree = "<group>"; };
126123
24D18D231F3E37DD008129EF /* Pin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pin.swift; sourceTree = "<group>"; };
127124
45CE7ABE76F48416DE57DF55 /* Pods_PinLayoutTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -260,7 +257,6 @@
260257
2475B6D21FC37CD40054CADD /* Coordinates.swift */,
261258
243C620E1FC3834B0082C327 /* Percent.swift */,
262259
2475B6CE1FC37C570054CADD /* TypesImpl.swift */,
263-
24BBE6341F50FA1D0091D5E9 /* UnitTests.swift */,
264260
2475B6D01FC37C8C0054CADD /* UIView+LTR.swift */,
265261
);
266262
name = Impl;
@@ -487,7 +483,6 @@
487483
24B02B0A1F2A713300C18179 /* PinLayout.swift in Sources */,
488484
243C620B1FC37F6C0082C327 /* UIView+LTR.swift in Sources */,
489485
243C62091FC37F6C0082C327 /* Coordinates.swift in Sources */,
490-
24BBE6381F52EC380091D5E9 /* UnitTests.swift in Sources */,
491486
243C620A1FC37F6C0082C327 /* TypesImpl.swift in Sources */,
492487
243C62061FC37F6C0082C327 /* PinLayoutImpl+Layouting.swift in Sources */,
493488
243C62051FC37F6C0082C327 /* PinLayoutImpl+Coordinates.swift in Sources */,
@@ -511,7 +506,6 @@
511506
2475B6D31FC37CD40054CADD /* Coordinates.swift in Sources */,
512507
241A277D1F8E958F00B1AD39 /* PinLayoutObjC.swift in Sources */,
513508
24949A2E1EF69474003643D3 /* PinLayout+Filters.swift in Sources */,
514-
24BBE6351F50FA1D0091D5E9 /* UnitTests.swift in Sources */,
515509
2475B6CD1FC37C1C0054CADD /* PinLayoutImpl+Relative.swift in Sources */,
516510
);
517511
runOnlyForDeploymentPostprocessing = 0;

PinLayoutTests copy-Info.plist

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>1</string>
21+
</dict>
22+
</plist>

Podfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ target 'PinLayoutSample' do
1414
platform :ios, "8.0"
1515
project 'Example/PinLayoutSample.xcodeproj'
1616

17+
pod 'PinLayout', :path => './'
18+
pod 'SwiftLint'
19+
1720
# Debug only
1821
pod 'Reveal-SDK', '~> 10', :configurations => ['Debug']
19-
pod 'SwiftLint'
2022
end

Podfile.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
PODS:
22
- Nimble (7.0.1)
3+
- PinLayout (1.5.8)
34
- Quick (1.1.0)
45
- Reveal-SDK (10)
56
- SwiftLint (0.22.0)
67

78
DEPENDENCIES:
89
- Nimble
10+
- PinLayout (from `./`)
911
- Quick
1012
- Reveal-SDK (~> 10)
1113
- SwiftLint
1214

15+
EXTERNAL SOURCES:
16+
PinLayout:
17+
:path: ./
18+
1319
SPEC CHECKSUMS:
1420
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
21+
PinLayout: 75a7e6ab39b9a5a2c1c981040c881ec08056eb39
1522
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
1623
Reveal-SDK: 7869ddf1f902cabbb07a1f0dd06bd25861a126f7
1724
SwiftLint: 1134786caedd2caab0560d2f36b76414a5a56808
1825

19-
PODFILE CHECKSUM: 551f30133c18993f273ef8fc6b94eac44639e0ff
26+
PODFILE CHECKSUM: 067c063d89fca2cec29a6ba8ecdf06609e1b01ed
2027

2128
COCOAPODS: 1.3.1

0 commit comments

Comments
 (0)