Skip to content

Commit 78f50be

Browse files
authored
Merge pull request #243 from layoutBox/test_ci
Test CI
2 parents bfd1374 + a574503 commit 78f50be

File tree

8 files changed

+24
-34
lines changed

8 files changed

+24
-34
lines changed

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
@@ -1,5 +1,5 @@
11
PODS:
2-
- FlexLayout (2.0.03)
2+
- FlexLayout (2.0.04)
33
- PinLayout (1.10.5)
44
- SwiftLint (0.54.0)
55

@@ -18,7 +18,7 @@ EXTERNAL SOURCES:
1818
:path: "../.."
1919

2020
SPEC CHECKSUMS:
21-
FlexLayout: 30999df7d5e5b8878af1f9691313a92edad91e17
21+
FlexLayout: 222177b4cd0c7e57b662ba05314a64c122958dac
2222
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
2323
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
2424

FlexLayout.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 13 deletions
This file was deleted.

FlexLayout.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- FlexLayout (2.0.03)
2+
- FlexLayout (2.0.04)
33
- PinLayout (1.10.5)
44
- SwiftLint (0.54.0)
55

@@ -18,7 +18,7 @@ EXTERNAL SOURCES:
1818
:path: "./"
1919

2020
SPEC CHECKSUMS:
21-
FlexLayout: 30999df7d5e5b8878af1f9691313a92edad91e17
21+
FlexLayout: 222177b4cd0c7e57b662ba05314a64c122958dac
2222
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
2323
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
2424

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
13
<p align="center">
24
<a href="https://github.com/layoutBox/FlexLayout"><img src="docs_markdown/images/flexlayout-logo-text.png" alt="FlexLayout" width="210"/></a>
35
</p>

docs_markdown/examples.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,20 @@
77

88
The FlexLayout's Example exposes some usage example of FlexLayout.
99

10-
The Example App is available in the [`Example`](https://github.com/layoutBox/FlexLayout/tree/master/Example) folder.
10+
The Example App is available in 2 versions:
1111

12-
### Running the Example app
13-
1. Do a `pod install` from the FlexLayout root directory.
12+
* [SPM (using Swift Package Manager)](https://github.com/layoutBox/FlexLayout/tree/master/Example/SPM)
13+
* [Cocoapods](https://github.com/layoutBox/FlexLayout/tree/master/Example/cocoapods)
14+
15+
### Running the SPM (Swift Package Manager) Example app
16+
1. Open the Xcode project `Example/SPM/FlexLayoutSample-SPM.xcodeproj`.
17+
3. Select the `FlexLayoutSample-SPM` target.
18+
4. Run the app on your device or simulator.
19+
20+
</br>
21+
22+
### Running the Cocoapods Example app
23+
1. Do a `pod install` from the `Example/cocoapods` directory.
1424
2. Open the newly generated `FlexLayout.xcworkspace` Xcode workspace.
1525
3. Select the `FlexLayoutSample` target.
1626
4. Run the app on your device or simulator.

fastlane/Fastfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ platform :ios do
3232

3333

3434
lane :build do
35-
install
36-
3735
swiftlint(
3836
mode: :lint,
3937
config_file: ".swiftlint.yml",
@@ -83,16 +81,17 @@ platform :ios do
8381
end
8482

8583
lane :tests do
86-
scan(scheme: "FlexLayout", workspace: "FlexLayout.xcworkspace")
84+
scan(scheme: "FlexLayout", workspace: "FlexLayout.xcworkspace", device: "iPhone 15")
8785
end
8886

8987
lane :doc do
9088
jazzy
9189
end
9290

9391
lane :travis do
94-
build
92+
install
9593
tests
94+
build
9695
#pod_lib_lint(allow_warnings: true, verbose: false)
9796
end
9897

0 commit comments

Comments
 (0)