Skip to content

Commit dff6637

Browse files
author
Luc Dion
committed
Update fastlane
1 parent ec4d6ad commit dff6637

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

‎Gemfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ GEM
115115
mime-types (~> 3.0)
116116
representable (~> 3.0)
117117
retriable (>= 2.0, < 4.0)
118-
googleauth (0.6.6)
118+
googleauth (0.6.7)
119119
faraday (~> 0.12)
120120
jwt (>= 1.4, < 3.0)
121-
memoist (~> 0.12)
121+
memoist (~> 0.16)
122122
multi_json (~> 1.11)
123123
os (>= 0.9, < 2.0)
124124
signet (~> 0.7)
@@ -177,7 +177,7 @@ GEM
177177
rb-fsevent (~> 0.9, >= 0.9.4)
178178
rb-inotify (~> 0.9, >= 0.9.7)
179179
security (0.1.3)
180-
signet (0.10.0)
180+
signet (0.11.0)
181181
addressable (~> 2.3)
182182
faraday (~> 0.9)
183183
jwt (>= 1.5, < 3.0)
@@ -209,7 +209,7 @@ GEM
209209
word_wrap (1.0.0)
210210
xcinvoke (0.3.0)
211211
liferaft (~> 0.0.6)
212-
xcodeproj (1.6.0)
212+
xcodeproj (1.7.0)
213213
CFPropertyList (>= 2.3.3, < 4.0)
214214
atomos (~> 0.1.3)
215215
claide (>= 1.0.2, < 2.0)
@@ -231,4 +231,4 @@ DEPENDENCIES
231231
xcpretty-travis-formatter
232232

233233
BUNDLED WITH
234-
1.16.3
234+
1.17.1

‎build-ci.sh‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,37 @@ time bundle exec fastlane mac travis &&
1818
echo "===============================" &&
1919
echo "iOS unit test" &&
2020
echo "===============================" &&
21-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator11.4 \
21+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
2222
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
2323
| xcpretty &&
2424

25-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator11.4 \
25+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
2626
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' \
2727
| xcpretty &&
2828

29-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator11.4 \
29+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
3030
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.4' \
3131
| xcpretty &&
3232

33+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
34+
-destination 'platform=iOS Simulator,name=iPhone XS,OS=12.0' \
35+
| xcpretty &&
36+
3337
echo "===============================" &&
3438
echo "tvOS unit test" &&
3539
echo "===============================" &&
36-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -derivedDataPath $DERIVED_DATA -sdk appletvsimulator11.4 \
40+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
3741
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=11.4' \
3842
| xcpretty &&
3943

44+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
45+
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.0' \
46+
| xcpretty &&
4047

4148
echo "===============================" &&
4249
echo "macOS unit test" &&
4350
echo "===============================" &&
44-
time xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -derivedDataPath $DERIVED_DATA -sdk macosx10.13 \
51+
time xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -derivedDataPath $DERIVED_DATA -sdk macosx10.14 \
4552
| xcpretty &&
4653

4754

@@ -51,8 +58,8 @@ echo "===============================" &&
5158
cd TestProjects/cocoapods/ios &&
5259
rm -rf $DERIVED_DATA &&
5360
pod install &&
54-
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
55-
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.4' \
61+
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator12.0 -derivedDataPath $DERIVED_DATA \
62+
-destination 'platform=iOS Simulator,name=iPhone 8,OS=12.0' \
5663
| xcpretty &&
5764
cd ../../.. &&
5865

@@ -63,7 +70,7 @@ echo "===============================" &&
6370
cd TestProjects/cocoapods/macos &&
6471
rm -rf $DERIVED_DATA &&
6572
pod install &&
66-
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS -sdk macosx10.13 -derivedDataPath $DERIVED_DATA \
73+
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS -sdk macosx10.14 -derivedDataPath $DERIVED_DATA \
6774
| xcpretty &&
6875
cd ../../.. &&
6976

@@ -74,8 +81,8 @@ echo "===============================" &&
7481
cd TestProjects/cocoapods/tvos &&
7582
rm -rf $DERIVED_DATA &&
7683
pod install &&
77-
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator11.4 -derivedDataPath $DERIVED_DATA \
78-
-destination 'platform=tvOS Simulator,name=Apple TV,OS=11.4' \
84+
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator12.0 -derivedDataPath $DERIVED_DATA \
85+
-destination 'platform=tvOS Simulator,name=Apple TV,OS=12.0' \
7986
| xcpretty &&
8087
cd ../../.. &&
8188

@@ -88,8 +95,8 @@ rm -rf $DERIVED_DATA &&
8895
rm Cartfile &&
8996
echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile &&
9097
carthage update --use-ssh --platform iOS &&
91-
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
92-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
98+
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.0 -derivedDataPath $DERIVED_DATA \
99+
-destination 'platform=iOS Simulator,name=iPhone 7,OS=12.0' \
93100
| xcpretty &&
94101
cd ../../..
95102

@@ -102,10 +109,10 @@ cd ../../..
102109
# rm -rf .build &&
103110
# rm Package.pins
104111
# swift package show-dependencies --format json &&
105-
# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
106-
# -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
112+
# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.0 -derivedDataPath $DERIVED_DATA \
113+
# -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.0' \
107114
# | xcpretty &&
108115
# cd ../../..
109116
#
110117
# #OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies'
111-
# xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -derivedDataPath $DERIVED_DATA -sdk macosx10.13 &&
118+
# xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -derivedDataPath $DERIVED_DATA -sdk macosx10.14 &&

‎fastlane/Fastfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ platform :ios do
3333
xcodebuild(
3434
project: "PinLayout.xcodeproj",
3535
scheme: "PinLayout-iOS",
36-
destination: "name=iPhone 8 Plus,OS=11.2",
36+
destination: "name=iPhone 8 Plus,OS=12.0",
3737
#configuration: "Debug",
3838
build: true,
3939
clean: true
@@ -52,7 +52,7 @@ platform :ios do
5252
scheme: "PinLayoutSample",
5353
build: true,
5454
clean: true,
55-
#destination: "name=iPhone 8 Plus,OS=11.2",
55+
#destination: "name=iPhone 8 Plus,OS=12.0",
5656
destination: "generic/platform=iOS\" CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=\""
5757
)
5858
end
@@ -65,7 +65,7 @@ platform :ios do
6565
"iPhone 7 (10.2)",
6666
"iPhone 8 (11.4)",
6767
"iPad Air (11.4)",
68-
"iPhone X (11.4)"
68+
"iPhone XS (12.0)"
6969
]
7070
)
7171
end
@@ -106,7 +106,7 @@ platform :mac do
106106
# scheme: "PinLayoutSample",
107107
# build: true,
108108
# clean: true,
109-
# #destination: "name=iPhone 8 Plus,OS=11.2",
109+
# #destination: "name=iPhone 8 Plus,OS=12.0",
110110
# destination: "generic/platform=iOS\" CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=\""
111111
#)
112112
end

0 commit comments

Comments
 (0)