Skip to content

Commit 72b86ee

Browse files
ayoyayoy
committed
Merge branch 'upstream-master' into SQLCipher
2 parents 61865e9 + c3cc998 commit 72b86ee

File tree

428 files changed

+37047
-27136
lines changed

Some content is hidden

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

428 files changed

+37047
-27136
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 50 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
2+
13
name: "GRDB CI"
24

35
on:
@@ -9,12 +11,14 @@ on:
911
- 'GRDB/**'
1012
- 'Tests/**'
1113
- '.github/workflows/**'
14+
- 'Makefile'
1215
- 'Package.swift'
1316
pull_request:
1417
paths:
1518
- 'GRDB/**'
1619
- 'Tests/**'
1720
- '.github/workflows/**'
21+
- 'Makefile'
1822
- 'Package.swift'
1923

2024
concurrency:
@@ -24,146 +28,124 @@ permissions:
2428
contents: read
2529

2630
jobs:
27-
macOS:
28-
name: macOS
31+
Framework:
32+
name: Framework
2933
runs-on: ${{ matrix.runsOn }}
34+
env:
35+
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
3036
timeout-minutes: 60
3137
strategy:
3238
fail-fast: false
3339
matrix:
3440
include:
35-
- xcode: "Xcode_13.3.1.app"
41+
- xcode: "Xcode_14.1.app"
3642
runsOn: macOS-12
37-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
38-
shell: "/bin/zsh {0}"
39-
- xcode: "Xcode_13.2.1.app"
40-
runsOn: macOS-11
41-
name: "macOS 11, Xcode 13.2.1, Swift 5.5.2"
42-
shell: "/bin/zsh {0}"
43-
- xcode: "Xcode_13.1.app"
44-
runsOn: macOS-11
45-
name: "macOS 11, Xcode 13.1, Swift 5.5.1"
46-
shell: "/bin/zsh {0}"
47-
- xcode: "Xcode_13.0.app"
48-
runsOn: macOS-11
49-
name: "macOS 11, Xcode 13.0, Swift 5.5.0"
50-
shell: "/bin/zsh {0}"
51-
- xcode: "Xcode_12.5.1.app"
52-
runsOn: macOS-11
53-
name: "macOS 11, Xcode 12.5.1, Swift 5.4"
54-
shell: "/bin/zsh {0}"
55-
- xcode: "Xcode_12.4.app"
56-
runsOn: macOS-10.15
57-
name: "macOS 10.15, Xcode 12.4, Swift 5.3"
58-
shell: "/bin/zsh {0}"
59-
steps:
60-
- uses: actions/checkout@v3
61-
- name: ${{ matrix.name }}
62-
run: make test_framework_GRDBOSX_maxSwift
63-
iOS:
64-
name: iOS
65-
runs-on: ${{ matrix.runsOn }}
66-
timeout-minutes: 60
67-
strategy:
68-
fail-fast: false
69-
matrix:
70-
include:
71-
- xcode: "Xcode_13.3.1.app"
43+
destination: "platform=macOS"
44+
name: "macOS"
45+
- xcode: "Xcode_14.1.app"
46+
runsOn: macOS-12
47+
destination: "OS=16.1,name=iPhone 14"
48+
name: "iOS"
49+
- xcode: "Xcode_14.1.app"
7250
runsOn: macOS-12
73-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
74-
shell: "/bin/zsh {0}"
75-
- xcode: "Xcode_12.4.app"
76-
runsOn: macOS-10.15
77-
name: "macOS 10.15, Xcode 12.4, Swift 5.3"
78-
shell: "/bin/zsh {0}"
51+
destination: "OS=16.1,name=Apple TV"
52+
name: "tvOS"
53+
- xcode: "Xcode_14.0.1.app"
54+
runsOn: macOS-12
55+
destination: "platform=macOS"
56+
name: "macOS"
57+
- xcode: "Xcode_14.0.1.app"
58+
runsOn: macOS-12
59+
destination: "OS=16.0,name=iPhone 14"
60+
name: "iOS"
7961
steps:
8062
- uses: actions/checkout@v3
8163
- name: ${{ matrix.name }}
82-
run: make test_framework_GRDBiOS_maxTarget_maxSwift
64+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project GRDB.xcodeproj -scheme GRDB -destination "${{ matrix.destination }}" OTHER_SWIFT_FLAGS='$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK' GCC_PREPROCESSOR_DEFINITIONS='$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1' clean test
8365
SPM:
8466
name: SPM
8567
runs-on: ${{ matrix.runsOn }}
68+
env:
69+
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
8670
timeout-minutes: 60
8771
strategy:
8872
fail-fast: false
8973
matrix:
9074
include:
91-
- xcode: "Xcode_13.3.1.app"
75+
- xcode: "Xcode_14.1.app"
76+
runsOn: macOS-12
77+
name: "Xcode 14.1"
78+
- xcode: "Xcode_14.0.1.app"
9279
runsOn: macOS-12
93-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
94-
shell: "/bin/zsh {0}"
80+
name: "Xcode 14.0.1"
9581
steps:
9682
- uses: actions/checkout@v3
9783
- name: ${{ matrix.name }}
9884
run: make test_SPM test_install_SPM
9985
SQLCipher3:
10086
name: SQLCipher3
10187
runs-on: ${{ matrix.runsOn }}
88+
env:
89+
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
10290
timeout-minutes: 60
10391
strategy:
10492
fail-fast: false
10593
matrix:
10694
include:
107-
- xcode: "Xcode_13.3.1.app"
95+
- xcode: "Xcode_14.1.app"
10896
runsOn: macOS-12
109-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
110-
shell: "/bin/zsh {0}"
97+
name: "Xcode 14.1"
11198
steps:
11299
- uses: actions/checkout@v3
113100
- name: ${{ matrix.name }}
114101
run: make test_framework_SQLCipher3Encrypted
115102
SQLCipher4:
116103
name: SQLCipher4
117104
runs-on: ${{ matrix.runsOn }}
105+
env:
106+
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
118107
timeout-minutes: 60
119108
strategy:
120109
fail-fast: false
121110
matrix:
122111
include:
123-
- xcode: "Xcode_13.3.1.app"
112+
- xcode: "Xcode_14.1.app"
124113
runsOn: macOS-12
125-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
126-
shell: "/bin/zsh {0}"
127-
- xcode: "Xcode_12.4.app"
128-
runsOn: macOS-10.15
129-
name: "macOS 10.15, Xcode 12.4, Swift 5.3"
130-
shell: "/bin/zsh {0}"
114+
name: "Xcode 14.1"
131115
steps:
132116
- uses: actions/checkout@v3
133117
- name: ${{ matrix.name }}
134118
run: make test_framework_SQLCipher4Encrypted
135119
CustomSQLite:
136120
name: CustomSQLite
137121
runs-on: ${{ matrix.runsOn }}
122+
env:
123+
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
138124
timeout-minutes: 60
139125
strategy:
140126
fail-fast: false
141127
matrix:
142128
include:
143-
- xcode: "Xcode_13.3.1.app"
129+
- xcode: "Xcode_14.1.app"
144130
runsOn: macOS-12
145-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
146-
shell: "/bin/zsh {0}"
147-
- xcode: "Xcode_12.4.app"
148-
runsOn: macOS-10.15
149-
name: "macOS 10.15, Xcode 12.4, Swift 5.3"
150-
shell: "/bin/zsh {0}"
131+
name: "Xcode 14.1"
151132
steps:
152133
- uses: actions/checkout@v3
153134
- name: ${{ matrix.name }}
154135
run: make test_framework_GRDBCustomSQLiteOSX
155136
XCFramework:
156137
name: XCFramework
157138
runs-on: ${{ matrix.runsOn }}
139+
env:
140+
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
158141
timeout-minutes: 60
159142
strategy:
160143
fail-fast: false
161144
matrix:
162145
include:
163-
- xcode: "Xcode_13.3.1.app"
146+
- xcode: "Xcode_14.1.app"
164147
runsOn: macOS-12
165-
name: "macOS 12, Xcode 13.3.1, Swift 5.6"
166-
shell: "/bin/zsh {0}"
148+
name: "Xcode 14.1"
167149
steps:
168150
- uses: actions/checkout@v3
169151
- name: ${{ matrix.name }}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ Podfile.lock
106106

107107
# SPM
108108
.build
109-
.swiftpm/
110109
GRDB.xcworkspace/xcshareddata/swiftpm
111110
#Package.resolved
112111
Tests/SPM/Packages

‎.spi.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: 1
2+
builder:
3+
configs:
4+
- documentation_targets: [GRDB]

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

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

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

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1410"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "GRDB_GRDBTests"
18+
BuildableName = "GRDB_GRDBTests"
19+
BlueprintName = "GRDB_GRDBTests"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "GRDB"
32+
BuildableName = "GRDB"
33+
BlueprintName = "GRDB"
34+
ReferencedContainer = "container:">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "YES"
40+
buildForProfiling = "YES"
41+
buildForArchiving = "YES"
42+
buildForAnalyzing = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "GRDB-dynamic"
46+
BuildableName = "GRDB-dynamic"
47+
BlueprintName = "GRDB-dynamic"
48+
ReferencedContainer = "container:">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "YES"
54+
buildForProfiling = "NO"
55+
buildForArchiving = "NO"
56+
buildForAnalyzing = "YES">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "GRDBTests"
60+
BuildableName = "GRDBTests"
61+
BlueprintName = "GRDBTests"
62+
ReferencedContainer = "container:">
63+
</BuildableReference>
64+
</BuildActionEntry>
65+
<BuildActionEntry
66+
buildForTesting = "YES"
67+
buildForRunning = "YES"
68+
buildForProfiling = "YES"
69+
buildForArchiving = "YES"
70+
buildForAnalyzing = "YES">
71+
<BuildableReference
72+
BuildableIdentifier = "primary"
73+
BlueprintIdentifier = "CSQLite"
74+
BuildableName = "CSQLite"
75+
BlueprintName = "CSQLite"
76+
ReferencedContainer = "container:">
77+
</BuildableReference>
78+
</BuildActionEntry>
79+
</BuildActionEntries>
80+
</BuildAction>
81+
<TestAction
82+
buildConfiguration = "Debug"
83+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
84+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
85+
shouldUseLaunchSchemeArgsEnv = "YES">
86+
<Testables>
87+
<TestableReference
88+
skipped = "NO"
89+
parallelizable = "YES">
90+
<BuildableReference
91+
BuildableIdentifier = "primary"
92+
BlueprintIdentifier = "GRDBTests"
93+
BuildableName = "GRDBTests"
94+
BlueprintName = "GRDBTests"
95+
ReferencedContainer = "container:">
96+
</BuildableReference>
97+
</TestableReference>
98+
</Testables>
99+
</TestAction>
100+
<LaunchAction
101+
buildConfiguration = "Debug"
102+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
103+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
104+
launchStyle = "0"
105+
useCustomWorkingDirectory = "NO"
106+
ignoresPersistentStateOnLaunch = "NO"
107+
debugDocumentVersioning = "YES"
108+
debugServiceExtension = "internal"
109+
allowLocationSimulation = "YES">
110+
</LaunchAction>
111+
<ProfileAction
112+
buildConfiguration = "Release"
113+
shouldUseLaunchSchemeArgsEnv = "YES"
114+
savedToolIdentifier = ""
115+
useCustomWorkingDirectory = "NO"
116+
debugDocumentVersioning = "YES">
117+
<MacroExpansion>
118+
<BuildableReference
119+
BuildableIdentifier = "primary"
120+
BlueprintIdentifier = "GRDB_GRDBTests"
121+
BuildableName = "GRDB_GRDBTests"
122+
BlueprintName = "GRDB_GRDBTests"
123+
ReferencedContainer = "container:">
124+
</BuildableReference>
125+
</MacroExpansion>
126+
</ProfileAction>
127+
<AnalyzeAction
128+
buildConfiguration = "Debug">
129+
</AnalyzeAction>
130+
<ArchiveAction
131+
buildConfiguration = "Release"
132+
revealArchiveInOrganizer = "YES">
133+
</ArchiveAction>
134+
</Scheme>

0 commit comments

Comments
 (0)