Skip to content

Commit 7296ea7

Browse files
committed
fix: fix build test
1 parent df3a6a6 commit 7296ea7

File tree

5 files changed

+48
-52
lines changed

5 files changed

+48
-52
lines changed

Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 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; };
@@ -199,7 +199,7 @@
199199
249EFE361E64FAFE00165E39 = {
200200
isa = PBXGroup;
201201
children = (
202-
249EFE411E64FAFE00165E39 /* ../FlexLayoutSample */,
202+
249EFE411E64FAFE00165E39 /* FlexLayoutSample */,
203203
461884C59B72ACEAFC912B8A /* Frameworks */,
204204
85CAAE97812075333AF3E88F /* Pods */,
205205
249EFE401E64FAFE00165E39 /* Products */,
@@ -214,7 +214,7 @@
214214
name = Products;
215215
sourceTree = "<group>";
216216
};
217-
249EFE411E64FAFE00165E39 /* ../FlexLayoutSample */ = {
217+
249EFE411E64FAFE00165E39 /* FlexLayoutSample */ = {
218218
isa = PBXGroup;
219219
children = (
220220
2439CC671E66614D003326FB /* Supporting Files */,
@@ -449,15 +449,15 @@
449449
);
450450
inputPaths = (
451451
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
452-
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
453452
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
454453
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
454+
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
455455
);
456456
name = "[CP] Embed Pods Frameworks";
457457
outputPaths = (
458-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
459458
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
460459
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
460+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
461461
);
462462
runOnlyForDeploymentPostprocessing = 0;
463463
shellPath = /bin/sh;

Example/cocoapods/FlexLayoutSample.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/cocoapods/Podfile.lock

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
PODS:
2-
- FlexLayout (2.0.04)
2+
- FlexLayout (2.0.10):
3+
- Yoga
34
- PinLayout (1.10.5)
45
- SwiftLint (0.54.0)
6+
- Yoga (1.14.0)
57

68
DEPENDENCIES:
79
- FlexLayout (from `../..`)
@@ -12,15 +14,17 @@ SPEC REPOS:
1214
trunk:
1315
- PinLayout
1416
- SwiftLint
17+
- Yoga
1518

1619
EXTERNAL SOURCES:
1720
FlexLayout:
1821
:path: "../.."
1922

2023
SPEC CHECKSUMS:
21-
FlexLayout: 222177b4cd0c7e57b662ba05314a64c122958dac
24+
FlexLayout: aaf305c1f3203be3d8694c3835773d1e7a912b72
2225
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
2326
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
27+
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
2428

2529
PODFILE CHECKSUM: acd6f8f55e169593da8f5d86c0f788512ba67886
2630

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ CHECKOUT OPTIONS:
2929
:tag: v3.1.0
3030

3131
SPEC CHECKSUMS:
32-
FlexLayout: a480ae4cb2b8a595c646cf7a3d2c7747951700a1
32+
FlexLayout: aaf305c1f3203be3d8694c3835773d1e7a912b72
3333
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
3434
SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
3535
Yoga: 73e3c7ca57e233ad32a1a265a8b55dcce6c4d529
3636

3737
PODFILE CHECKSUM: 616cb577f11ab8498737680dedeed47c6fae4b64
3838

39-
COCOAPODS: 1.15.2
39+
COCOAPODS: 1.14.3

fastlane/Fastfile

Lines changed: 24 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# This is the minimum version number required.
88
# Update this, if you use features of a newer version
9-
fastlane_version "2.29.0"
9+
fastlane_version '2.29.0'
1010

1111
default_platform :ios
1212
skip_docs
@@ -22,95 +22,77 @@ platform :ios do
2222
use_bundle_exec: true,
2323
try_repo_update_on_error: true
2424
)
25-
26-
cocoapods(
27-
podfile: "Example/cocoapods",
28-
use_bundle_exec: true,
29-
try_repo_update_on_error: true
30-
)
3125
end
3226

33-
3427
lane :build do
3528
swiftlint(
36-
mode: :lint,
37-
config_file: ".swiftlint.yml",
38-
executable: "Pods/SwiftLint/swiftlint",
29+
mode: :lint,
30+
config_file: '.swiftlint.yml',
31+
executable: 'Pods/SwiftLint/swiftlint',
3932
ignore_exit_status: true
4033
)
4134

4235
# FlexLayout
4336
xcodebuild(
44-
project: "FlexLayout.xcodeproj",
45-
scheme: "FlexLayoutInner",
46-
configuration: "Release",
37+
workspace: 'FlexLayout.xcworkspace',
38+
scheme: 'FlexLayoutInner',
39+
configuration: 'Release',
4740
build: true,
4841
clean: true,
49-
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
42+
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
5043
)
5144

5245
# FlexLayoutSample from FlexLayout.xcworkspace
5346
xcodebuild(
54-
workspace: "FlexLayout.xcworkspace",
55-
scheme: "FlexLayoutSample",
56-
configuration: "Release",
47+
workspace: 'FlexLayout.xcworkspace',
48+
scheme: 'FlexLayoutSample',
49+
configuration: 'Release',
5750
build: true,
5851
# clean: true,
59-
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
60-
)
61-
62-
# Example Cocoapods
63-
xcodebuild(
64-
workspace: "Example/cocoapods/FlexLayoutSample.xcworkspace",
65-
scheme: "FlexLayoutSample",
66-
configuration: "Release",
67-
build: true,
68-
# clean: true,
69-
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
52+
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
7053
)
7154

7255
# Example SPM (Swift Package Manager)
7356
xcodebuild(
74-
project: "Example/SPM/FlexLayoutSample-SPM.xcodeproj",
75-
scheme: "FlexLayoutSample-SPM",
76-
configuration: "Release",
57+
project: 'Example/SPM/FlexLayoutSample-SPM.xcodeproj',
58+
scheme: 'FlexLayoutSample-SPM',
59+
configuration: 'Release',
7760
build: true,
7861
clean: true,
79-
destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
62+
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
8063
)
8164
end
8265

8366
lane :tests do
84-
scan(scheme: "FlexLayoutInner", workspace: "FlexLayout.xcworkspace", device: "iPhone 15")
67+
scan(scheme: 'FlexLayoutInner', workspace: 'FlexLayout.xcworkspace', device: 'iPhone 15')
8568
end
8669

87-
lane :doc do
70+
lane :doc do
8871
jazzy
8972
end
9073

9174
lane :travis do
9275
install
9376
tests
9477
build
95-
#pod_lib_lint(allow_warnings: true, verbose: false)
78+
# pod_lib_lint(allow_warnings: true, verbose: false)
9679
end
9780

9881
lane :deploy do
9982
ensure_git_branch
100-
version = version_bump_podspec(path: "FlexLayout.podspec")
101-
git_commit(path: ["./FlexLayout.podspec"], message: "Bumped to version #{version}")
83+
version = version_bump_podspec(path: 'FlexLayout.podspec')
84+
git_commit(path: ['./FlexLayout.podspec'], message: "Bumped to version #{version}")
10285
push_to_git_remote(remote_branch: 'master', force: false, tags: true)
10386
changelog = changelog_from_git_commits
10487
github_release = set_github_release(
105-
repository_name: "layoutBox/FlexLayout",
88+
repository_name: 'layoutBox/FlexLayout',
10689
api_token: ENV['GITHUB_TOKEN'],
10790
name: version,
10891
tag_name: version,
10992
description: changelog,
110-
commitish: "master"
93+
commitish: 'master'
11194
)
112-
sh("git fetch --tags")
95+
sh('git fetch --tags')
11396
pod_push(allow_warnings: true, verbose: true)
11497
end
115-
11698
end

0 commit comments

Comments
 (0)