Skip to content

Commit 5e3e952

Browse files
authored
[PM-19516] Consolidate shared dependencies and settings in project-common.yml (#1899)
1 parent f131eb5 commit 5e3e952

File tree

4 files changed

+35
-76
lines changed

4 files changed

+35
-76
lines changed

project-bwa.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,19 @@ fileGroups:
44
configs:
55
Debug: debug
66
Release: release
7+
include:
8+
- path: project-common.yml
79
options:
8-
createIntermediateGroups: true
9-
deploymentTarget:
10-
iOS: 15.0
11-
watchOS: 8.0
12-
groupSortPosition: top
13-
usesTabs: false
14-
indentWidth: 4
15-
tabWidth: 4
1610
fileTypes:
1711
"icon":
1812
file: true
1913
settings:
2014
MARKETING_VERSION: 2024.6.1
2115
CURRENT_PROJECT_VERSION: 1
22-
include:
23-
- path: Configs/local-sdk.yml
24-
relativePaths: false
25-
enable: ${LOCAL_SDK}
2616
packages:
27-
BitwardenSdk:
28-
url: https://github.com/bitwarden/sdk-swift
29-
revision: fe0f17e2c217497fe83e40c8dca324880070dea9
30-
branch: unstable
31-
Firebase:
32-
url: https://github.com/firebase/firebase-ios-sdk
33-
exactVersion: 11.14.0
34-
SnapshotTesting:
35-
url: https://github.com/pointfreeco/swift-snapshot-testing
36-
exactVersion: 1.18.4
3717
SwiftProtobuf:
3818
url: https://github.com/apple/swift-protobuf
3919
exactVersion: 1.31.0
40-
ViewInspector:
41-
url: https://github.com/nalexn/ViewInspector
42-
exactVersion: 0.10.1
4320
projectReferences:
4421
BitwardenKit:
4522
path: BitwardenKit.xcodeproj

project-bwk.yml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,15 @@ fileGroups:
44
configs:
55
Debug: debug
66
Release: release
7-
options:
8-
createIntermediateGroups: true
9-
deploymentTarget:
10-
iOS: 15.0
11-
watchOS: 8.0
12-
groupSortPosition: top
13-
usesTabs: false
14-
indentWidth: 4
15-
tabWidth: 4
7+
include:
8+
- path: project-common.yml
169
settings:
1710
MARKETING_VERSION: 2024.6.0 # Bump this for a new version update.
1811
CURRENT_PROJECT_VERSION: 1
19-
include:
20-
- path: Configs/local-sdk.yml
21-
relativePaths: false
22-
enable: ${LOCAL_SDK}
2312
packages:
24-
BitwardenSdk:
25-
url: https://github.com/bitwarden/sdk-swift
26-
revision: fe0f17e2c217497fe83e40c8dca324880070dea9
27-
branch: unstable
28-
Firebase:
29-
url: https://github.com/firebase/firebase-ios-sdk
30-
exactVersion: 11.14.0
3113
SwiftUIIntrospect:
3214
url: https://github.com/siteline/SwiftUI-Introspect
3315
exactVersion: 1.3.0
34-
SnapshotTesting:
35-
url: https://github.com/pointfreeco/swift-snapshot-testing
36-
exactVersion: 1.18.4
37-
ViewInspector:
38-
url: https://github.com/nalexn/ViewInspector
39-
exactVersion: 0.10.1
4016
schemes:
4117
AuthenticatorBridgeKit:
4218
build:

project-common.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
options:
2+
createIntermediateGroups: true
3+
deploymentTarget:
4+
iOS: 15.0
5+
watchOS: 8.0
6+
groupSortPosition: top
7+
usesTabs: false
8+
indentWidth: 4
9+
tabWidth: 4
10+
11+
include:
12+
- path: Configs/local-sdk.yml
13+
relativePaths: false
14+
enable: ${LOCAL_SDK}
15+
16+
packages:
17+
BitwardenSdk:
18+
url: https://github.com/bitwarden/sdk-swift
19+
revision: fe0f17e2c217497fe83e40c8dca324880070dea9
20+
branch: unstable
21+
Firebase:
22+
url: https://github.com/firebase/firebase-ios-sdk
23+
exactVersion: 11.14.0
24+
SnapshotTesting:
25+
url: https://github.com/pointfreeco/swift-snapshot-testing
26+
exactVersion: 1.18.4
27+
ViewInspector:
28+
url: https://github.com/nalexn/ViewInspector
29+
exactVersion: 0.10.1

project-pm.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,19 @@ fileGroups:
55
configs:
66
Debug: debug
77
Release: release
8+
include:
9+
- path: project-common.yml
810
options:
9-
createIntermediateGroups: true
10-
deploymentTarget:
11-
iOS: 15.0
12-
watchOS: 8.0
13-
groupSortPosition: top
14-
usesTabs: false
15-
indentWidth: 4
16-
tabWidth: 4
1711
fileTypes:
1812
"icon":
1913
file: true
2014
settings:
2115
MARKETING_VERSION: 2024.6.0 # Bump this for a new version update.
2216
CURRENT_PROJECT_VERSION: 1
23-
include:
24-
- path: Configs/local-sdk.yml
25-
relativePaths: false
26-
enable: ${LOCAL_SDK}
2717
packages:
28-
BitwardenSdk:
29-
url: https://github.com/bitwarden/sdk-swift
30-
revision: fe0f17e2c217497fe83e40c8dca324880070dea9
31-
branch: unstable
32-
Firebase:
33-
url: https://github.com/firebase/firebase-ios-sdk
34-
exactVersion: 11.14.0
3518
SwiftUIIntrospect:
3619
url: https://github.com/siteline/SwiftUI-Introspect
3720
exactVersion: 1.3.0
38-
SnapshotTesting:
39-
url: https://github.com/pointfreeco/swift-snapshot-testing
40-
exactVersion: 1.18.4
41-
ViewInspector:
42-
url: https://github.com/nalexn/ViewInspector
43-
exactVersion: 0.10.1
4421
projectReferences:
4522
BitwardenKit:
4623
path: BitwardenKit.xcodeproj

0 commit comments

Comments
 (0)