Skip to content

Commit c7d5048

Browse files
Jason-AbbottJason-Abbott
authored
Merge branch 'groue:development' into development
2 parents 93292d8 + be22e0a commit c7d5048

File tree

529 files changed

+22477
-14966
lines changed

Some content is hidden

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

529 files changed

+22477
-14966
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[*.swift]
2+
indent_style = space
3+
indent_size = 4
4+
tab_width = 4
5+
end_of_line = lf
6+
insert_final_newline = true
7+
max_line_length = 76
8+
trim_trailing_whitespace = true

‎.github/workflows/CI.yml‎

Lines changed: 24 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
1+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
22

33
name: "GRDB CI"
44

@@ -40,42 +40,18 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
include:
43-
- xcode: "Xcode_14.3.1.app"
44-
runsOn: macOS-13
43+
- xcode: "Xcode_16.1.app"
44+
runsOn: macOS-14
4545
destination: "platform=macOS"
4646
name: "macOS"
47-
- xcode: "Xcode_14.3.1.app"
48-
runsOn: macOS-13
49-
destination: "OS=16.4,name=iPhone 14 Pro"
47+
- xcode: "Xcode_16.1.app"
48+
runsOn: macOS-14
49+
destination: "OS=18.1,name=iPhone 16 Pro"
5050
name: "iOS"
51-
- xcode: "Xcode_14.3.1.app"
52-
runsOn: macOS-13
53-
destination: "OS=16.4,name=Apple TV"
51+
- xcode: "Xcode_16.1.app"
52+
runsOn: macOS-14
53+
destination: "OS=18.1,name=Apple TV"
5454
name: "tvOS"
55-
- xcode: "Xcode_14.2.app"
56-
runsOn: macOS-13
57-
destination: "platform=macOS"
58-
name: "macOS"
59-
- xcode: "Xcode_14.2.app"
60-
runsOn: macOS-13
61-
destination: "OS=16.2,name=iPhone 14"
62-
name: "iOS"
63-
- xcode: "Xcode_14.1.app"
64-
runsOn: macOS-13
65-
destination: "platform=macOS"
66-
name: "macOS"
67-
- xcode: "Xcode_14.1.app"
68-
runsOn: macOS-13
69-
destination: "OS=16.1,name=iPhone 14"
70-
name: "iOS"
71-
- xcode: "Xcode_14.0.1.app"
72-
runsOn: macOS-12
73-
destination: "platform=macOS"
74-
name: "macOS"
75-
- xcode: "Xcode_14.0.1.app"
76-
runsOn: macOS-12
77-
destination: "OS=16.0,name=iPhone 14"
78-
name: "iOS"
7955
steps:
8056
- uses: actions/checkout@v4
8157
- name: ${{ matrix.name }}
@@ -90,18 +66,9 @@ jobs:
9066
fail-fast: false
9167
matrix:
9268
include:
93-
- xcode: "Xcode_14.3.1.app"
94-
runsOn: macOS-13
95-
name: "Xcode 14.3.1"
96-
- xcode: "Xcode_14.2.app"
97-
runsOn: macOS-13
98-
name: "Xcode 14.2"
99-
- xcode: "Xcode_14.1.app"
100-
runsOn: macOS-13
101-
name: "Xcode 14.1"
102-
- xcode: "Xcode_14.0.1.app"
103-
runsOn: macOS-12
104-
name: "Xcode 14.0.1"
69+
- xcode: "Xcode_16.1.app"
70+
runsOn: macOS-14
71+
name: "Xcode 16.1"
10572
steps:
10673
- uses: actions/checkout@v4
10774
- name: ${{ matrix.name }}
@@ -116,12 +83,9 @@ jobs:
11683
fail-fast: false
11784
matrix:
11885
include:
119-
- xcode: "Xcode_14.3.1.app"
120-
runsOn: macOS-13
121-
name: "Xcode 14.3.1"
122-
- xcode: "Xcode_14.0.1.app"
123-
runsOn: macOS-12
124-
name: "Xcode 14.0.1"
86+
- xcode: "Xcode_16.1.app"
87+
runsOn: macOS-14
88+
name: "Xcode 16.1"
12589
steps:
12690
- uses: actions/checkout@v4
12791
- name: ${{ matrix.name }}
@@ -136,12 +100,9 @@ jobs:
136100
fail-fast: false
137101
matrix:
138102
include:
139-
- xcode: "Xcode_14.3.1.app"
140-
runsOn: macOS-13
141-
name: "Xcode 14.3.1"
142-
- xcode: "Xcode_14.0.1.app"
143-
runsOn: macOS-12
144-
name: "Xcode 14.0.1"
103+
- xcode: "Xcode_16.1.app"
104+
runsOn: macOS-14
105+
name: "Xcode 16.1"
145106
steps:
146107
- uses: actions/checkout@v4
147108
- name: ${{ matrix.name }}
@@ -156,12 +117,9 @@ jobs:
156117
fail-fast: false
157118
matrix:
158119
include:
159-
- xcode: "Xcode_14.3.1.app"
160-
runsOn: macOS-13
161-
name: "Xcode 14.3.1"
162-
- xcode: "Xcode_14.0.1.app"
163-
runsOn: macOS-12
164-
name: "Xcode 14.0.1"
120+
- xcode: "Xcode_16.1.app"
121+
runsOn: macOS-14
122+
name: "Xcode 16.1"
165123
steps:
166124
- uses: actions/checkout@v4
167125
- name: ${{ matrix.name }}
@@ -176,12 +134,9 @@ jobs:
176134
fail-fast: false
177135
matrix:
178136
include:
179-
- xcode: "Xcode_14.3.1.app"
180-
runsOn: macOS-13
181-
name: "Xcode 14.3.1"
182-
- xcode: "Xcode_14.0.1.app"
183-
runsOn: macOS-12
184-
name: "Xcode 14.0.1"
137+
- xcode: "Xcode_16.1.app"
138+
runsOn: macOS-14
139+
name: "Xcode 16.1"
185140
steps:
186141
- uses: actions/checkout@v4
187142
- name: ${{ matrix.name }}

‎.spi.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ version: 1
22
builder:
33
configs:
44
- documentation_targets: [GRDB]
5+
swift_version: 6.0

‎.swiftpm/xcode/xcshareddata/xcschemes/GRDB-Package.xcscheme‎

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

0 commit comments

Comments
 (0)