Skip to content

Commit

Permalink
fix: Ensure SQLite.Expression takes precedence over Foundation (#107)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbmorley authored Sep 18, 2024
1 parent 2d0d0fa commit fd75a46
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Folders.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
D85AC0D72BAE2005003CAE8F /* NSCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85AC0D62BAE2005003CAE8F /* NSCollectionView.swift */; };
D85AC0D92BAE217F003CAE8F /* CollectionViewNavigationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85AC0D82BAE217F003CAE8F /* CollectionViewNavigationResult.swift */; };
D85C07B12B7EBC3A00C8BAA6 /* FolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85C07B02B7EBC3A00C8BAA6 /* FolderView.swift */; };
D85D9F522C9A868F00178F10 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85D9F512C9A868D00178F10 /* Expression.swift */; };
D870EC9E2B7EC47B00704688 /* FolderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D870EC9D2B7EC47B00704688 /* FolderModel.swift */; };
D870ECA12B7ED5D700704688 /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = D870ECA02B7ED5D700704688 /* Algorithms */; };
D870ECA42B7EDD8A00704688 /* Diligence in Frameworks */ = {isa = PBXBuildFile; productRef = D870ECA32B7EDD8A00704688 /* Diligence */; };
Expand Down Expand Up @@ -100,6 +101,7 @@
D85AC0D62BAE2005003CAE8F /* NSCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSCollectionView.swift; sourceTree = "<group>"; };
D85AC0D82BAE217F003CAE8F /* CollectionViewNavigationResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewNavigationResult.swift; sourceTree = "<group>"; };
D85C07B02B7EBC3A00C8BAA6 /* FolderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderView.swift; sourceTree = "<group>"; };
D85D9F512C9A868D00178F10 /* Expression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Expression.swift; sourceTree = "<group>"; };
D861A32F2B8EC22900A79214 /* Folders.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Folders.xctestplan; sourceTree = "<group>"; };
D870EC9D2B7EC47B00704688 /* FolderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderModel.swift; sourceTree = "<group>"; };
D870ECA62B7EDDD100704688 /* folders-license */ = {isa = PBXFileReference; lastKnownFileType = text; path = "folders-license"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -181,6 +183,7 @@
children = (
D85AC0D82BAE217F003CAE8F /* CollectionViewNavigationResult.swift */,
D8DDBCC72B2A1582003EAF4E /* DirectoryScanner.swift */,
D85D9F512C9A868D00178F10 /* Expression.swift */,
D83312E22B76FE4E00B994B3 /* Filter.swift */,
D8A82E3C2BADF38000DD32DA /* IndexPathSequence.swift */,
D83E624C2BADF8960039EC83 /* NavigationDirection.swift */,
Expand Down Expand Up @@ -483,6 +486,7 @@
buildActionMask = 2147483647;
files = (
D89622E62ACD42F2006F7D2E /* SceneModel.swift in Sources */,
D85D9F522C9A868F00178F10 /* Expression.swift in Sources */,
D8472A6C2B2518900070DB64 /* NSCollectionViewDiffableDataSource.swift in Sources */,
D8F6A6152B8D84840003B1A6 /* StoreUpdater.swift in Sources */,
D89622E42ACD4266006F7D2E /* LibraryView.swift in Sources */,
Expand Down
26 changes: 26 additions & 0 deletions Folders/Utilities/Expression.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// MIT License
//
// Copyright (c) 2023-2024 Jason Morley
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

import SQLite

// Unfortunately Foundation has now introduced `Expression` so we need to ensure the one from SQLite takes precedence.
typealias Expression = SQLite.Expression

0 comments on commit fd75a46

Please sign in to comment.