Skip to content
This repository was archived by the owner on Jul 17, 2025. It is now read-only.

Commit 1da1df2

Browse files
committed
Merge branch 'develop'
2 parents a52271b + 4992beb commit 1da1df2

File tree

63 files changed

+257
-803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+257
-803
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ jobs:
88
build:
99
name: Run PR-CI
1010
runs-on: macOS-latest
11+
env:
12+
SCHEME: KarrotFlex
13+
SDK: iphonesimulator
14+
DESTINATION: platform=iOS Simulator,name=iPhone 13 Pro,OS=latest
1115

1216
steps:
1317
- name: Checkout the Git repository
1418
uses: actions/checkout@v2
15-
16-
- name: Install Ruby Dependencies
17-
run: |
18-
bundle install
19-
20-
- name: Pod Install
21-
run: |
22-
bundle exec pod install --project-directory=Example
2319

2420
- name: Build and Test
2521
run: |
26-
cd ./Example
27-
bundle exec fastlane ios execute_pull_request_ci_test
28-
cd ..
22+
set -o pipefail && xcodebuild clean build test \
23+
-scheme "$SCHEME" \
24+
-sdk "$SDK" \
25+
-destination "$DESTINATION" \
26+
-configuration Debug \
27+
-enableCodeCoverage YES \
28+
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c;
2929
3030
- name: Codecov
3131
uses: codecov/codecov-action@v2.1.0

Example/KarrotFlex.xcodeproj/project.pbxproj

Lines changed: 0 additions & 208 deletions
Large diffs are not rendered by default.

Example/KarrotFlex.xcodeproj/xcshareddata/xcschemes/KarrotFlex-Example.xcscheme

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:KarrotFlex.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "607FACE41AFB9204008FA782"
32-
BuildableName = "KarrotFlex_Tests.xctest"
33-
BlueprintName = "KarrotFlex_Tests"
34-
ReferencedContainer = "container:KarrotFlex.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
</BuildActionEntries>
3824
</BuildAction>
3925
<TestAction
@@ -50,29 +36,7 @@
5036
ReferencedContainer = "container:KarrotFlex.xcodeproj">
5137
</BuildableReference>
5238
</MacroExpansion>
53-
<EnvironmentVariables>
54-
<EnvironmentVariable
55-
key = "FB_REFERENCE_IMAGE_DIR"
56-
value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages"
57-
isEnabled = "YES">
58-
</EnvironmentVariable>
59-
<EnvironmentVariable
60-
key = "IMAGE_DIFF_DIR"
61-
value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/FailureDiffs"
62-
isEnabled = "YES">
63-
</EnvironmentVariable>
64-
</EnvironmentVariables>
6539
<Testables>
66-
<TestableReference
67-
skipped = "NO">
68-
<BuildableReference
69-
BuildableIdentifier = "primary"
70-
BlueprintIdentifier = "607FACE41AFB9204008FA782"
71-
BuildableName = "KarrotFlex_Tests.xctest"
72-
BlueprintName = "KarrotFlex_Tests"
73-
ReferencedContainer = "container:KarrotFlex.xcodeproj">
74-
</BuildableReference>
75-
</TestableReference>
7640
</Testables>
7741
</TestAction>
7842
<LaunchAction

Example/Podfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,4 @@ platform :ios, '11.0'
44

55
target 'KarrotFlex_Example' do
66
pod 'KarrotFlex', :path => '../'
7-
8-
target 'KarrotFlex_Tests' do
9-
inherit! :search_paths
10-
11-
pod 'FBSnapshotTestCase' , '~> 2.1.4'
12-
end
137
end

Example/Podfile.lock

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
PODS:
2-
- FBSnapshotTestCase (2.1.4):
3-
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
4-
- FBSnapshotTestCase/Core (2.1.4)
5-
- FBSnapshotTestCase/SwiftSupport (2.1.4):
6-
- FBSnapshotTestCase/Core
72
- FlexLayout (1.3.22)
8-
- KarrotFlex (1.0.1):
3+
- KarrotFlex (1.1.0):
94
- FlexLayout (~> 1.3)
105
- PinLayout (~> 1.10.0)
116
- PinLayout (1.10.0)
127

138
DEPENDENCIES:
14-
- FBSnapshotTestCase (~> 2.1.4)
159
- KarrotFlex (from `../`)
1610

1711
SPEC REPOS:
1812
trunk:
19-
- FBSnapshotTestCase
2013
- FlexLayout
2114
- PinLayout
2215

@@ -25,11 +18,10 @@ EXTERNAL SOURCES:
2518
:path: "../"
2619

2720
SPEC CHECKSUMS:
28-
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
2921
FlexLayout: df96321d364c4c5fd38f85caf90b607f7b1b4f48
30-
KarrotFlex: dd2a7d614dbda570585d8c3696ef552ea786b112
22+
KarrotFlex: f92ad546f833bf4bb2a5d45803ddac6539458541
3123
PinLayout: e50e9a748b632905fca6e67043ea4b05d6c92186
3224

33-
PODFILE CHECKSUM: 5663e70073c793d029a18513abc64ba182fb2c5b
25+
PODFILE CHECKSUM: 87685cfaeeab3c8233befd8bfa98b5d72f1c8f6d
3426

3527
COCOAPODS: 1.11.2

Example/Tests/FlexCenterTests.swift

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

0 commit comments

Comments
 (0)