Skip to content

Commit e02f2c8

Browse files
grouegroue
committed
Merge branch 'development'
2 parents b947065 + c0e9c87 commit e02f2c8

File tree

13 files changed

+81
-91
lines changed

13 files changed

+81
-91
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
77

88
#### 5.x Releases
99

10+
- `5.25.x` Releases - [5.25.0](#5250)
1011
- `5.24.x` Releases - [5.24.0](#5240) | [5.24.1](#5241)
1112
- `5.23.x` Releases - [5.23.0](#5230)
1213
- `5.22.x` Releases - [5.22.0](#5220) | [5.22.1](#5221) | [5.22.2](#5222)
@@ -91,6 +92,15 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
9192

9293
---
9394

95+
## 5.25.0
96+
97+
Released June 11, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v5.24.1...v5.25.0)
98+
99+
- **New**: [#1226](https://github.com/groue/GRDB.swift/pull/1226) by [@naveensrinivasan](https://github.com/naveensrinivasan): Included githubactions in the dependabot config
100+
- **New**: [#1228](https://github.com/groue/GRDB.swift/pull/1228) by [@naveensrinivasan](https://github.com/naveensrinivasan): Set permissions for GitHub actions
101+
- **New**: [#1235](https://github.com/groue/GRDB.swift/pull/1235) by [@groue](https://github.com/groue): Raise default Quality of Service to `.userInitiated`.
102+
- **Fixed**: [#1233](https://github.com/groue/GRDB.swift/pull/1233) by [@GetToSet](https://github.com/GetToSet): Fix warnings of redundant conformance constraint on Xcode 14.
103+
94104
## 5.24.1
95105

96106
Released May 26, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v5.24.0...v5.24.1)

‎Documentation/FullTextSearch.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ let pattern = FTS3Pattern(matchingAnyTokenIn: "") // nil
304304
let pattern = FTS3Pattern(matchingAnyTokenIn: "*") // nil
305305
```
306306

307-
FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.24/Structs/StatementArguments.html):
307+
FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.25/Structs/StatementArguments.html):
308308

309309
```swift
310310
let documents = try Document.fetchAll(db,
@@ -587,7 +587,7 @@ let pattern = FTS5Pattern(matchingAnyTokenIn: "") // nil
587587
let pattern = FTS5Pattern(matchingAnyTokenIn: "*") // nil
588588
```
589589

590-
FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.24/Structs/StatementArguments.html):
590+
FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.25/Structs/StatementArguments.html):
591591

592592
```swift
593593
let documents = try Document.fetchAll(db,

‎Documentation/Migrations.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ try dbQueue.read { db in
7777
}
7878
```
7979

80-
See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/5.24/Structs/DatabaseMigrator.html) for more migrator methods.
80+
See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/5.25/Structs/DatabaseMigrator.html) for more migrator methods.
8181

8282

8383
## The `eraseDatabaseOnSchemaChange` Option

‎GRDB.swift.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GRDB.swift'
3-
s.version = '5.24.1'
3+
s.version = '5.25.0'
44

55
s.license = { :type => 'MIT', :file => 'LICENSE' }
66
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'

‎GRDB.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,7 @@
28742874
/* Begin PBXShellScriptBuildPhase section */
28752875
56EB54F322C8ED5100850069 /* Swiftlint */ = {
28762876
isa = PBXShellScriptBuildPhase;
2877+
alwaysOutOfDate = 1;
28772878
buildActionMask = 2147483647;
28782879
files = (
28792880
);
@@ -2892,6 +2893,7 @@
28922893
};
28932894
56EB54FA22C9115E00850069 /* Swiftlint */ = {
28942895
isa = PBXShellScriptBuildPhase;
2896+
alwaysOutOfDate = 1;
28952897
buildActionMask = 2147483647;
28962898
files = (
28972899
);
@@ -2910,6 +2912,7 @@
29102912
};
29112913
AAA4DCFA230F1E0600C74B15 /* Swiftlint */ = {
29122914
isa = PBXShellScriptBuildPhase;
2915+
alwaysOutOfDate = 1;
29132916
buildActionMask = 2147483647;
29142917
files = (
29152918
);

‎GRDB/Core/Configuration.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ public struct Configuration {
245245
///
246246
/// The quality of service is ignored if you supply a target queue.
247247
///
248-
/// Default: .default
249-
public var qos: DispatchQoS = .default
248+
/// Default: .userInitiated
249+
public var qos: DispatchQoS = .userInitiated
250250

251251
/// The quality of service of read accesses
252252
var readQoS: DispatchQoS {

‎GRDB/Fixit/GRDB-5.0.swift‎

Lines changed: 11 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -314,31 +314,22 @@ extension ValueObservation {
314314
{ preconditionFailure() }
315315

316316
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
317-
public func combine<
318-
R1: _ValueReducer,
319-
Combined>(
317+
public func combine<R1, Combined>(
320318
_ other: ValueObservation<R1>,
321319
_ transform: @escaping (Reducer.Value, R1.Value) -> Combined)
322320
-> ValueObservation<ValueReducers.Unavailable<Combined>>
323321
{ preconditionFailure() }
324322

325323
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
326-
public func combine<
327-
R1: _ValueReducer,
328-
R2: _ValueReducer,
329-
Combined>(
324+
public func combine<R1, R2, Combined>(
330325
_ observation1: ValueObservation<R1>,
331326
_ observation2: ValueObservation<R2>,
332327
_ transform: @escaping (Reducer.Value, R1.Value, R2.Value) -> Combined)
333328
-> ValueObservation<ValueReducers.Unavailable<Combined>>
334329
{ preconditionFailure() }
335330

336331
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
337-
public func combine<
338-
R1: _ValueReducer,
339-
R2: _ValueReducer,
340-
R3: _ValueReducer,
341-
Combined>(
332+
public func combine<R1, R2, R3, Combined>(
342333
_ observation1: ValueObservation<R1>,
343334
_ observation2: ValueObservation<R2>,
344335
_ observation3: ValueObservation<R3>,
@@ -347,12 +338,7 @@ extension ValueObservation {
347338
{ preconditionFailure() }
348339

349340
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
350-
public func combine<
351-
R1: _ValueReducer,
352-
R2: _ValueReducer,
353-
R3: _ValueReducer,
354-
R4: _ValueReducer,
355-
Combined>(
341+
public func combine<R1, R2, R3, R4, Combined>(
356342
_ observation1: ValueObservation<R1>,
357343
_ observation2: ValueObservation<R2>,
358344
_ observation3: ValueObservation<R3>,
@@ -374,31 +360,22 @@ extension ValueObservation {
374360

375361
extension ValueObservation where Reducer == ValueReducers.Auto {
376362
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
377-
public static func combine<
378-
R1: _ValueReducer,
379-
R2: _ValueReducer>(
363+
public static func combine<R1, R2>(
380364
_ o1: ValueObservation<R1>,
381365
_ o2: ValueObservation<R2>)
382366
-> ValueObservation<ValueReducers.Unavailable<(R1.Value, R2.Value)>>
383367
{ preconditionFailure() }
384368

385369
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
386-
public static func combine<
387-
R1: _ValueReducer,
388-
R2: _ValueReducer,
389-
R3: _ValueReducer>(
370+
public static func combine<R1, R2, R3>(
390371
_ o1: ValueObservation<R1>,
391372
_ o2: ValueObservation<R2>,
392373
_ o3: ValueObservation<R3>)
393374
-> ValueObservation<ValueReducers.Unavailable<(R1.Value, R2.Value, R3.Value)>>
394375
{ preconditionFailure() }
395376

396377
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
397-
public static func combine<
398-
R1: _ValueReducer,
399-
R2: _ValueReducer,
400-
R3: _ValueReducer,
401-
R4: _ValueReducer>(
378+
public static func combine<R1, R2, R3, R4>(
402379
_ o1: ValueObservation<R1>,
403380
_ o2: ValueObservation<R2>,
404381
_ o3: ValueObservation<R3>,
@@ -407,12 +384,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
407384
{ preconditionFailure() }
408385

409386
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
410-
public static func combine<
411-
R1: _ValueReducer,
412-
R2: _ValueReducer,
413-
R3: _ValueReducer,
414-
R4: _ValueReducer,
415-
R5: _ValueReducer>(
387+
public static func combine<R1, R2, R3, R4, R5>(
416388
_ o1: ValueObservation<R1>,
417389
_ o2: ValueObservation<R2>,
418390
_ o3: ValueObservation<R3>,
@@ -422,13 +394,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
422394
{ preconditionFailure() }
423395

424396
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
425-
public static func combine<
426-
R1: _ValueReducer,
427-
R2: _ValueReducer,
428-
R3: _ValueReducer,
429-
R4: _ValueReducer,
430-
R5: _ValueReducer,
431-
R6: _ValueReducer>(
397+
public static func combine<R1, R2, R3, R4, R5, R6>(
432398
_ o1: ValueObservation<R1>,
433399
_ o2: ValueObservation<R2>,
434400
_ o3: ValueObservation<R3>,
@@ -439,14 +405,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
439405
{ preconditionFailure() }
440406

441407
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
442-
public static func combine<
443-
R1: _ValueReducer,
444-
R2: _ValueReducer,
445-
R3: _ValueReducer,
446-
R4: _ValueReducer,
447-
R5: _ValueReducer,
448-
R6: _ValueReducer,
449-
R7: _ValueReducer>(
408+
public static func combine<R1, R2, R3, R4, R5, R6, R7>(
450409
_ o1: ValueObservation<R1>,
451410
_ o2: ValueObservation<R2>,
452411
_ o3: ValueObservation<R3>,
@@ -458,15 +417,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
458417
{ preconditionFailure() }
459418

460419
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
461-
public static func combine<
462-
R1: _ValueReducer,
463-
R2: _ValueReducer,
464-
R3: _ValueReducer,
465-
R4: _ValueReducer,
466-
R5: _ValueReducer,
467-
R6: _ValueReducer,
468-
R7: _ValueReducer,
469-
R8: _ValueReducer>(
420+
public static func combine<R1, R2, R3, R4, R5, R6, R7, R8>(
470421
_ o1: ValueObservation<R1>,
471422
_ o2: ValueObservation<R2>,
472423
_ o3: ValueObservation<R3>,

‎GRDBCustom.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,7 @@
22312231
/* Begin PBXShellScriptBuildPhase section */
22322232
56EB54FB22C9118600850069 /* Swiftlint */ = {
22332233
isa = PBXShellScriptBuildPhase;
2234+
alwaysOutOfDate = 1;
22342235
buildActionMask = 2147483647;
22352236
files = (
22362237
);
@@ -2249,6 +2250,7 @@
22492250
};
22502251
56EB54FD22C9119B00850069 /* Swiftlint */ = {
22512252
isa = PBXShellScriptBuildPhase;
2253+
alwaysOutOfDate = 1;
22522254
buildActionMask = 2147483647;
22532255
files = (
22542256
);

‎Makefile‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ TEST_ACTIONS = clean build build-for-testing test-without-building
5050

5151
# When adding support for an Xcode version, look for available devices with
5252
# `xcrun xctrace list devices` (or the deprecated `instruments -s devices`).
53-
ifeq ($(XCODEVERSION),13.4)
53+
ifeq ($(XCODEVERSION),14.0)
54+
MAX_SWIFT_VERSION = 5.7
55+
MIN_SWIFT_VERSION = 5.3
56+
MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 13,OS=16.0"
57+
MIN_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 8,OS=12.4"
58+
MAX_TVOS_DESTINATION = "platform=tvOS Simulator,name=Apple TV,OS=16.0"
59+
#MIN_TVOS_DESTINATION = "platform=tvOS Simulator,name=Apple TV,OS=11.4" TODO: restore
60+
OTHER_SWIFT_FLAGS = '$$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK -Xfrontend -warn-concurrency -Xfrontend -enable-actor-data-race-checks'
61+
GCC_PREPROCESSOR_DEFINITIONS = '$$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1'
62+
else ifeq ($(XCODEVERSION),13.4)
5463
MAX_SWIFT_VERSION = 5.6
5564
MIN_SWIFT_VERSION = 5.3
5665
MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 13,OS=15.5"
@@ -577,10 +586,10 @@ ifdef JAZZY
577586
--author 'Gwendal Roué' \
578587
--author_url https://github.com/groue \
579588
--github_url https://github.com/groue/GRDB.swift \
580-
--github-file-prefix https://github.com/groue/GRDB.swift/tree/v5.24.1 \
581-
--module-version 5.24.1 \
589+
--github-file-prefix https://github.com/groue/GRDB.swift/tree/v5.25.0 \
590+
--module-version 5.25.0 \
582591
--module GRDB \
583-
--root-url http://groue.github.io/GRDB.swift/docs/5.24/ \
592+
--root-url http://groue.github.io/GRDB.swift/docs/5.25/ \
584593
--output Documentation/Reference \
585594
--xcodebuild-arguments -project,GRDB.xcodeproj,-scheme,GRDBiOS
586595
else

0 commit comments

Comments
 (0)