From 023ffbd1e56583798756207235b227cff7af6393 Mon Sep 17 00:00:00 2001 From: jaywcjlove <398188662@qq.com> Date: Tue, 10 Oct 2023 12:32:11 +0800 Subject: [PATCH] fix: move folder. --- .gitignore | 12 ++++++++++++ SearchField/Package.swift => Package.swift | 0 SearchField.xcworkspace/contents.xcworkspacedata | 3 --- .../xcshareddata/WorkspaceSettings.xcsettings | 5 +++++ SearchField/.gitignore | 8 -------- .../SearchFieldExample.xcodeproj/project.pbxproj | 12 ++++++++---- .../xcschemes/xcschememanagement.plist | 2 +- .../SearchField/SearchField.swift | 0 .../SearchFieldTests/SearchFieldTests.swift | 0 9 files changed, 26 insertions(+), 16 deletions(-) rename SearchField/Package.swift => Package.swift (100%) create mode 100644 SearchField.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 SearchField/.gitignore rename {SearchField/Sources => Sources}/SearchField/SearchField.swift (100%) rename {SearchField/Tests => Tests}/SearchFieldTests/SearchFieldTests.swift (100%) diff --git a/.gitignore b/.gitignore index ba1ff083..3c125873 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,18 @@ # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +.DS_Store +/.build +/Packages +xcuserdata/ +DerivedData/ +.swiftpm/configuration/registries.json +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.netrc + + + ## User settings xcuserdata/ diff --git a/SearchField/Package.swift b/Package.swift similarity index 100% rename from SearchField/Package.swift rename to Package.swift diff --git a/SearchField.xcworkspace/contents.xcworkspacedata b/SearchField.xcworkspace/contents.xcworkspacedata index 9b3d7f61..b81615a3 100644 --- a/SearchField.xcworkspace/contents.xcworkspacedata +++ b/SearchField.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/SearchField.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SearchField.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..0c67376e --- /dev/null +++ b/SearchField.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/SearchField/.gitignore b/SearchField/.gitignore deleted file mode 100644 index 0023a534..00000000 --- a/SearchField/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -/.build -/Packages -xcuserdata/ -DerivedData/ -.swiftpm/configuration/registries.json -.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata -.netrc diff --git a/SearchFieldExample/SearchFieldExample.xcodeproj/project.pbxproj b/SearchFieldExample/SearchFieldExample.xcodeproj/project.pbxproj index 8288dfad..ea391b6e 100644 --- a/SearchFieldExample/SearchFieldExample.xcodeproj/project.pbxproj +++ b/SearchFieldExample/SearchFieldExample.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 7D440D0C2AD4DA510043D2FC /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D440D0B2AD4DA510043D2FC /* ContentView.swift */; }; 7D440D0E2AD4DA540043D2FC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D440D0D2AD4DA540043D2FC /* Assets.xcassets */; }; 7D440D122AD4DA540043D2FC /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D440D112AD4DA540043D2FC /* Preview Assets.xcassets */; }; - 7D440D1A2AD4DC160043D2FC /* SearchField in Frameworks */ = {isa = PBXBuildFile; productRef = 7D440D192AD4DC160043D2FC /* SearchField */; }; + 7D85CC692AD50ACC007CD89D /* SearchField in Frameworks */ = {isa = PBXBuildFile; productRef = 7D85CC682AD50ACC007CD89D /* SearchField */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -21,6 +21,7 @@ 7D440D0D2AD4DA540043D2FC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 7D440D0F2AD4DA540043D2FC /* SearchFieldExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SearchFieldExample.entitlements; sourceTree = ""; }; 7D440D112AD4DA540043D2FC /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 7D440D1C2AD504EE0043D2FC /* swiftui-searchfield */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "swiftui-searchfield"; path = ..; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -28,7 +29,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7D440D1A2AD4DC160043D2FC /* SearchField in Frameworks */, + 7D85CC692AD50ACC007CD89D /* SearchField in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -75,6 +76,7 @@ 7D440D182AD4DC160043D2FC /* Frameworks */ = { isa = PBXGroup; children = ( + 7D440D1C2AD504EE0043D2FC /* swiftui-searchfield */, ); name = Frameworks; sourceTree = ""; @@ -96,7 +98,7 @@ ); name = SearchFieldExample; packageProductDependencies = ( - 7D440D192AD4DC160043D2FC /* SearchField */, + 7D85CC682AD50ACC007CD89D /* SearchField */, ); productName = SearchFieldExample; productReference = 7D440D062AD4DA510043D2FC /* SearchFieldExample.app */; @@ -126,6 +128,8 @@ Base, ); mainGroup = 7D440CFD2AD4DA510043D2FC; + packageReferences = ( + ); productRefGroup = 7D440D072AD4DA510043D2FC /* Products */; projectDirPath = ""; projectRoot = ""; @@ -374,7 +378,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 7D440D192AD4DC160043D2FC /* SearchField */ = { + 7D85CC682AD50ACC007CD89D /* SearchField */ = { isa = XCSwiftPackageProductDependency; productName = SearchField; }; diff --git a/SearchFieldExample/SearchFieldExample.xcodeproj/xcuserdata/wangchujiang.xcuserdatad/xcschemes/xcschememanagement.plist b/SearchFieldExample/SearchFieldExample.xcodeproj/xcuserdata/wangchujiang.xcuserdatad/xcschemes/xcschememanagement.plist index ef6d7bab..11e654f2 100644 --- a/SearchFieldExample/SearchFieldExample.xcodeproj/xcuserdata/wangchujiang.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/SearchFieldExample/SearchFieldExample.xcodeproj/xcuserdata/wangchujiang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ SearchFieldExample.xcscheme_^#shared#^_ orderHint - 1 + 0 diff --git a/SearchField/Sources/SearchField/SearchField.swift b/Sources/SearchField/SearchField.swift similarity index 100% rename from SearchField/Sources/SearchField/SearchField.swift rename to Sources/SearchField/SearchField.swift diff --git a/SearchField/Tests/SearchFieldTests/SearchFieldTests.swift b/Tests/SearchFieldTests/SearchFieldTests.swift similarity index 100% rename from SearchField/Tests/SearchFieldTests/SearchFieldTests.swift rename to Tests/SearchFieldTests/SearchFieldTests.swift