Skip to content

Commit e30b9ab

Browse files
lucdionlucdion
committed
Update Fastlane script
1 parent 62f25ff commit e30b9ab

File tree

4 files changed

+50
-39
lines changed

4 files changed

+50
-39
lines changed

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
24FB88401F59CA9A00615D33 /* MethodGroupHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MethodGroupHeader.swift; sourceTree = "<group>"; };
8686
60BAE155247DF4120020119C /* YogaExampleFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YogaExampleFView.swift; sourceTree = "<group>"; };
8787
60BAE157247DF4CE0020119C /* YogaExampleFViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YogaExampleFViewController.swift; sourceTree = "<group>"; };
88-
B9EA7C522409B79B000D8E35 /* FlexLayoutSampleSPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlexLayoutSampleSPM.app; sourceTree = BUILT_PRODUCTS_DIR; };
88+
B9EA7C522409B79B000D8E35 /* FlexLayoutSample-SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FlexLayoutSample-SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8989
DF0E85291F1F749C00AB1956 /* YogaExampleBView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YogaExampleBView.swift; sourceTree = "<group>"; };
9090
DF0E852A1F1F749C00AB1956 /* YogaExampleBViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YogaExampleBViewController.swift; sourceTree = "<group>"; };
9191
DF91747D1F1F6F9A0034632D /* YogaExampleAView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YogaExampleAView.swift; sourceTree = "<group>"; };
@@ -193,7 +193,7 @@
193193
249EFE401E64FAFE00165E39 /* Products */ = {
194194
isa = PBXGroup;
195195
children = (
196-
B9EA7C522409B79B000D8E35 /* FlexLayoutSampleSPM.app */,
196+
B9EA7C522409B79B000D8E35 /* FlexLayoutSample-SPM.app */,
197197
);
198198
name = Products;
199199
sourceTree = "<group>";
@@ -322,9 +322,9 @@
322322
/* End PBXGroup section */
323323

324324
/* Begin PBXNativeTarget section */
325-
B9EA7C512409B79B000D8E35 /* FlexLayoutSampleSPM */ = {
325+
B9EA7C512409B79B000D8E35 /* FlexLayoutSample-SPM */ = {
326326
isa = PBXNativeTarget;
327-
buildConfigurationList = B9EA7C652409B79C000D8E35 /* Build configuration list for PBXNativeTarget "FlexLayoutSampleSPM" */;
327+
buildConfigurationList = B9EA7C652409B79C000D8E35 /* Build configuration list for PBXNativeTarget "FlexLayoutSample-SPM" */;
328328
buildPhases = (
329329
B9EA7C4E2409B79B000D8E35 /* Sources */,
330330
B9EA7C4F2409B79B000D8E35 /* Frameworks */,
@@ -335,13 +335,13 @@
335335
);
336336
dependencies = (
337337
);
338-
name = FlexLayoutSampleSPM;
338+
name = "FlexLayoutSample-SPM";
339339
packageProductDependencies = (
340340
B9EA7C912409BAE1000D8E35 /* PinLayout */,
341341
7173B6812ACC6DD600EB0092 /* FlexLayout */,
342342
);
343343
productName = FlexLayoutSampleSPM;
344-
productReference = B9EA7C522409B79B000D8E35 /* FlexLayoutSampleSPM.app */;
344+
productReference = B9EA7C522409B79B000D8E35 /* FlexLayoutSample-SPM.app */;
345345
productType = "com.apple.product-type.application";
346346
};
347347
/* End PBXNativeTarget section */
@@ -377,7 +377,7 @@
377377
projectDirPath = "";
378378
projectRoot = "";
379379
targets = (
380-
B9EA7C512409B79B000D8E35 /* FlexLayoutSampleSPM */,
380+
B9EA7C512409B79B000D8E35 /* FlexLayoutSample-SPM */,
381381
);
382382
};
383383
/* End PBXProject section */
@@ -657,7 +657,7 @@
657657
defaultConfigurationIsVisible = 0;
658658
defaultConfigurationName = Release;
659659
};
660-
B9EA7C652409B79C000D8E35 /* Build configuration list for PBXNativeTarget "FlexLayoutSampleSPM" */ = {
660+
B9EA7C652409B79C000D8E35 /* Build configuration list for PBXNativeTarget "FlexLayoutSample-SPM" */ = {
661661
isa = XCConfigurationList;
662662
buildConfigurations = (
663663
B9EA7C632409B79C000D8E35 /* Debug */,

‎Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
/* End PBXCopyFilesBuildPhase section */
6363

6464
/* Begin PBXFileReference section */
65-
0D0595B5E0950936D037ECF2 /* Pods-FlexLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutSample.release.xcconfig"; path = "../../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
65+
0D0595B5E0950936D037ECF2 /* Pods-FlexLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
6666
242AECDF1FA011630024E7C2 /* BaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
6767
242AECE01FA011630024E7C2 /* BasicView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicView.swift; sourceTree = "<group>"; };
6868
242AECE11FA011630024E7C2 /* Stylesheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stylesheet.swift; sourceTree = "<group>"; };
@@ -99,7 +99,7 @@
9999
60BAE155247DF4120020119C /* YogaExampleFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YogaExampleFView.swift; sourceTree = "<group>"; };
100100
60BAE157247DF4CE0020119C /* YogaExampleFViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YogaExampleFViewController.swift; sourceTree = "<group>"; };
101101
82FCE524E22C2FF5BC4DFBAB /* Pods_FlexLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlexLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
102-
8561ACDBCFFA1B4B9ABEAB16 /* Pods-FlexLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutSample.debug.xcconfig"; path = "../../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
102+
8561ACDBCFFA1B4B9ABEAB16 /* Pods-FlexLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
103103
DF0E85291F1F749C00AB1956 /* YogaExampleBView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YogaExampleBView.swift; sourceTree = "<group>"; };
104104
DF0E852A1F1F749C00AB1956 /* YogaExampleBViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YogaExampleBViewController.swift; sourceTree = "<group>"; };
105105
DF1F2A221F17D11700BA1B97 /* FlexLayoutSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlexLayoutSample.app; sourceTree = BUILT_PRODUCTS_DIR; };

‎Example/cocoapods/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ EXTERNAL SOURCES:
1818
:path: "../.."
1919

2020
SPEC CHECKSUMS:
21-
FlexLayout: 21c38713c7294121c3bb20724ccb9789a8ef3585
21+
FlexLayout: bd1d1738d67a455205e14c42492fe5450e3c1554
2222
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
2323
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
2424

2525
PODFILE CHECKSUM: acd6f8f55e169593da8f5d86c0f788512ba67886
2626

27-
COCOAPODS: 1.14.2
27+
COCOAPODS: 1.14.3

‎fastlane/Fastfile

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,62 +17,73 @@ platform :ios do
1717

1818
lane :install do
1919
bundle_install
20+
2021
cocoapods(
2122
use_bundle_exec: true,
2223
try_repo_update_on_error: true
2324
)
2425

25-
#carthage(
26-
# command: "bootstrap",
27-
# use_ssh: true,
28-
# platform: "iOS",
29-
#)
26+
cocoapods(
27+
podfile: "Example/cocoapods",
28+
use_bundle_exec: true,
29+
try_repo_update_on_error: true
30+
)
3031
end
3132

33+
3234
lane :build do
3335
install
3436

35-
#Dir.chdir("..") do
36-
swiftlint(
37-
mode: :lint,
38-
config_file: ".swiftlint.yml",
39-
executable: "Pods/SwiftLint/swiftlint",
40-
ignore_exit_status: true
41-
)
42-
#end
37+
swiftlint(
38+
mode: :lint,
39+
config_file: ".swiftlint.yml",
40+
executable: "Pods/SwiftLint/swiftlint",
41+
ignore_exit_status: true
42+
)
4343

44+
# FlexLayout
4445
xcodebuild(
4546
project: "FlexLayout.xcodeproj",
4647
scheme: "FlexLayout",
4748
configuration: "Release",
4849
build: true,
4950
clean: true,
50-
destination: "platform=iOS Simulator,name=iPhone 8,OS=15.2"
51+
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.0"
5152
)
5253

53-
#xcodebuild(
54-
# workspace: "FlexLayout.xcworkspace",
55-
# scheme: "FlexLayoutTVOS",
56-
# configuration: "Release",
57-
# build: true,
58-
# clean: true
59-
# destination: "platform=iOS Simulator,name=iPhone X,OS=15.2"
60-
#)
61-
54+
# FlexLayoutSample from FlexLayout.xcworkspace
6255
xcodebuild(
6356
workspace: "FlexLayout.xcworkspace",
6457
scheme: "FlexLayoutSample",
6558
configuration: "Release",
6659
build: true,
60+
# clean: true,
61+
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.0"
62+
)
63+
64+
# Example Cocoapods
65+
xcodebuild(
66+
workspace: "Example/cocoapods/FlexLayoutSample.xcworkspace",
67+
scheme: "FlexLayoutSample",
68+
configuration: "Release",
69+
build: true,
70+
# clean: true,
71+
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.0"
72+
)
73+
74+
# Example SPM (Swift Package Manager)
75+
xcodebuild(
76+
project: "Example/SPM/FlexLayoutSample-SPM.xcodeproj",
77+
scheme: "FlexLayoutSample-SPM",
78+
configuration: "Release",
79+
build: true,
6780
clean: true,
68-
destination: "platform=iOS Simulator,name=iPhone 8,OS=15.2"
81+
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.0"
6982
)
7083
end
7184

7285
lane :tests do
73-
# sh "buck test :yoga "
74-
scan(scheme: "FlexLayoutSample",
75-
workspace: "FlexLayout.xcworkspace")
86+
scan(scheme: "FlexLayout", workspace: "FlexLayout.xcworkspace")
7687
end
7788

7889
lane :doc do

0 commit comments

Comments
 (0)