Add GRDB+Swift 5.7 #792

groue · 2023-03-25T08:03:49Z

Pull Request Description

Hello, this pull request adds compatibility check for GRDB with Swift 5.0, 5.1, 5.3, and 5.7.

Compatibility with Swift 5.3 had been added by #574, but it was reverted for some reason (???). This PR restores the deleted compatibility checks.

Acceptance Criteria

To be accepted into the Swift source compatibility test suite, a project must:

$ ./project_precommit_check GRDB.swift --earliest-compatible-swift-version 5.7
** CHECK **
--- Validating GRDB.swift Swift version 5.7 compatibility ---
--- Project configured to be compatible with Swift 5.7 ---
--- Checking GRDB.swift platform compatibility with Darwin ---
--- Platform compatibility check succeeded ---
--- Locating swiftc executable ---
$ xcrun -f swiftc
--- Checking installed Swift version ---
$ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc --version
swift-driver version: 1.62.15 --- Version check failed ---
Expected version:
Apple Swift version 5.7.0 (swiftlang-5.7.0.123.8 clang-1400.0.29.50)
Target: x86_64-apple-darwin22.3.0

Current version:
Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
Target: arm64-apple-macosx13.0

warning: Unexpected swiftc version. Expected swiftc for Swift 5.7 can be found in Xcode 14.0 (contains Swift 5.7.0).
warning: Continuing to build with unexpected swiftc version.

--- Executing build actions ---
$ /Users/groue/Documents/git/groue/swift-source-compat-suite/runner.py --swift-branch swift-5.7-branch --swiftc /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc --projects /Users/groue/Documents/git/groue/swift-source-compat-suite/projects.json --include-repos 'path == "GRDB.swift"' --include-versions 'version == "5.7"' --include-actions 'action.startswith("Build")'
Building 1 projects across 10 parallel processes

PASS: GRDB.swift, 5.7, 2d19ca, Swift Package
========================================
Action Summary:
     Passed: 1
     Failed: 0
    XFailed: 0
    UPassed: 0
      Total: 1
========================================
Repository Summary:
      Total: 1
========================================
Result: PASS
========================================
--- GRDB.swift checked successfully against Swift 5.7 ---

Also, restore swiftlang#574 which had been reverted for some reason, leaving only support for Swift 4.2 compatibility :-(

groue · 2023-03-25T12:40:54Z

@shahmishal, sorry for quoting you, but according to my experience from #574, the CI won't do anything until you trigger it as in this comment. This PR is useful in the context of [Pitch] Elide some in Swift 6 (see this comment). I'm somewhat worried by the fact that this repo has lost my previous contributions, so I'd be relieved to see GRDB well protected against breaking language changes. 😬

groue · 2023-03-31T04:16:17Z

Hello @shahmishal, @justice-adams-apple. What can I do to have this PR merged?

justice-adams-apple · 2023-03-31T18:31:50Z

@groue Sorry for late response! I'll kick off the testing now and get this in soon. Could you elaborate on

I'm somewhat worried by the fact that this repo has lost my previous contributions

Did something you committed previously get removed?

justice-adams-apple · 2023-03-31T18:31:58Z

@swift-ci test

justice-adams-apple · 2023-03-31T21:31:47Z

projects.json

-      }
+      },
+      {
+        "version": "5.0",


@groue Ok I did some digging, I see that #613 removed the revisions for 5.0, 5.1, and 5.3 by mistake.

The source compat suite will pass the language major version to the compiler. So the swift build will use -swift-version 5 for each of these GRDB versions you listed, meaning each entry will be built the same way (although with different repository revisions), I'm not sure if that's what you intended. If you want to build all these various GRDB revisions the same way (with -swift-version 5), then leave it as is.

If you want to build just one revision of GRDB with -swift-version 5, I'd recommend just one entry with your most recent commit, namely

{ "version": "5.7", "commit": "2d19cab2b525f885ee8d7efec96093431f6b5f20" }

It's up to you, as I'm not sure about the nature of the commit revisions in question

Thank you @justice-adams-apple :-)

It's up to you, as I'm not sure about the nature of the commit revisions in question

Thanks for the precision :-) The version I care about is the latest, but the library has changed a lot in years, so I'd rather keep a few old versions here - for the sake of compatibility testing :-)

I have pushed a fix, e1e956a, with the latest commit supported by each language version.

with the latest commit supported by each language version

justice-adams-apple · 2023-04-03T21:21:46Z

@swift-ci test

groue · 2023-04-11T06:37:03Z

Is there anything I should change in the pull request?

justice-adams-apple · 2023-04-11T16:31:22Z

@groue the projet is currently failing to build with

wift-source-compat-suite/project_cache/GRDB.swift/GRDB/Core/DatabaseSnapshotPool.swift:137:24: error: cannot find 'sqlite3_snapshot_open' in scope
            let code = sqlite3_snapshot_open(db.sqliteConnection, "main", walSnapshot.sqliteSnapshot)
error: fatalError

I believe (correct me if I'm wrong) this is due to our need to update the SDK used in our open source CI system, which we are planning to do by the end of this week. So the plan is to update the SDK, then merge this :)

groue · 2023-04-11T16:59:05Z

Thanks for the feedback, @justice-adams-apple :-)

I believe (correct me if I'm wrong) this is due to our need to update the SDK used in our open source CI system [...]

I think you're right.

sqlite3_snapshot_open is quite a special SQLite api. I remember asking for it in FB9793771 ;-)

It is guarded, in GRDB code, by this compiler condition:

#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER && (compiler(>=5.7.1) || !(os(macOS) || targetEnvironment(macCatalyst))))

The capitalized flags test for various flavors of SQLite (custom build or SQLCipher) that are unrelated to compatibility checking - we can forget about them.

Remains compiler(>=5.7.1) || !(os(macOS) || targetEnvironment(macCatalyst)).

This complex test is necessary for the macOS SDK that ships with Xcode 14.0 very specifically. Maybe you remember, but N.0 Xcode versions ship with weird sdks (new stuff, and old stuff at the same time). Things were fixed in Xcode 14.0.1.

I'm pretty sure this is the problem: the SDK used for compatibility testing misses sqlite3_snapshot_open, but is not detected by the above condition.

So the plan is to update the SDK, then merge this :)

☺️

justice-adams-apple · 2023-04-12T17:14:10Z

@swift-ci test

shahmishal · 2023-04-13T17:51:27Z

  | PASS_GRDB.swift_4.2_BuildSwiftPackage.log 
  | PASS_GRDB.swift_5.1_BuildSwiftPackage.log
  | PASS_GRDB.swift_5.3_BuildSwiftPackage.log
  | PASS_GRDB.swift_5.7_BuildSwiftPackage.log

groue · 2023-04-13T17:55:05Z

Thank you very much!

Add GRDB+Swift 5.7

5f3c34f

Also, restore swiftlang#574 which had been reverted for some reason, leaving only support for Swift 4.2 compatibility :-(

groue requested review from shahmishal and justice-adams-apple as code owners March 25, 2023 08:03

justice-adams-apple reviewed Mar 31, 2023

View reviewed changes

Fix GRDB commits

e1e956a

with the latest commit supported by each language version

justice-adams-apple approved these changes Apr 13, 2023

View reviewed changes

shahmishal merged commit a6eeca4 into swiftlang:main Apr 13, 2023

groue mentioned this pull request Jan 14, 2025

Support for Swift 6.0? #963

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add GRDB+Swift 5.7 #792

Add GRDB+Swift 5.7 #792

Uh oh!

groue commented Mar 25, 2023 •

edited

Loading

Uh oh!

groue commented Mar 25, 2023 •

edited

Loading

Uh oh!

groue commented Mar 31, 2023

Uh oh!

justice-adams-apple commented Mar 31, 2023

Uh oh!

justice-adams-apple commented Mar 31, 2023

Uh oh!

justice-adams-apple Mar 31, 2023

Uh oh!

groue Apr 1, 2023

Uh oh!

justice-adams-apple commented Apr 3, 2023

Uh oh!

groue commented Apr 11, 2023

Uh oh!

justice-adams-apple commented Apr 11, 2023 •

edited

Loading

Uh oh!

groue commented Apr 11, 2023

Uh oh!

justice-adams-apple commented Apr 12, 2023

Uh oh!

shahmishal commented Apr 13, 2023

Uh oh!

groue commented Apr 13, 2023

Uh oh!

Uh oh!

Add GRDB+Swift 5.7 #792

Add GRDB+Swift 5.7 #792

Uh oh!

Conversation

groue commented Mar 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Description

Acceptance Criteria

Uh oh!

groue commented Mar 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

groue commented Mar 31, 2023

Uh oh!

justice-adams-apple commented Mar 31, 2023

Uh oh!

justice-adams-apple commented Mar 31, 2023

Uh oh!

justice-adams-apple Mar 31, 2023

Choose a reason for hiding this comment

Uh oh!

groue Apr 1, 2023

Choose a reason for hiding this comment

Uh oh!

justice-adams-apple commented Apr 3, 2023

Uh oh!

groue commented Apr 11, 2023

Uh oh!

justice-adams-apple commented Apr 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

groue commented Apr 11, 2023

Uh oh!

justice-adams-apple commented Apr 12, 2023

Uh oh!

shahmishal commented Apr 13, 2023

Uh oh!

groue commented Apr 13, 2023

Uh oh!

Uh oh!

groue commented Mar 25, 2023 •

edited

Loading

groue commented Mar 25, 2023 •

edited

Loading

justice-adams-apple commented Apr 11, 2023 •

edited

Loading