From b316a2125893c6ff1421d8ec3ad3796c496a29f3 Mon Sep 17 00:00:00 2001
From: mustiikhalil <26250654+mustiikhalil@users.noreply.github.com>
Date: Sat, 24 Sep 2022 21:13:01 +0200
Subject: [PATCH] Moves swift package to root of repository so it can be used
 directly from the main repo

---
 swift/FlatBuffers.podspec => FlatBuffers.podspec         | 4 ++--
 swift/Package.swift => Package.swift                     | 1 +
 swift/Package@swift-5.5.swift => Package@swift-5.5.swift | 3 ++-
 tests/swift/Wasm.tests/Package.swift                     | 2 +-
 tests/swift/benchmarks/Package.swift                     | 2 +-
 tests/swift/tests/Package.swift                          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename swift/FlatBuffers.podspec => FlatBuffers.podspec (80%)
 rename swift/Package.swift => Package.swift (96%)
 rename swift/Package@swift-5.5.swift => Package@swift-5.5.swift (93%)

diff --git a/swift/FlatBuffers.podspec b/FlatBuffers.podspec
similarity index 80%
rename from swift/FlatBuffers.podspec
rename to FlatBuffers.podspec
index c26d1a2f882c..78b6577a8597 100644
--- a/swift/FlatBuffers.podspec
+++ b/FlatBuffers.podspec
@@ -11,11 +11,11 @@ Pod::Spec.new do |s|
   s.homepage         = 'https://github.com/google/flatbuffers'
   s.license          = { :type => 'Apache2.0', :file => 'LICENSE' }
   s.author           = { 'mustii' => 'mustii@mmk.one' }
-  s.source           = { :git => 'https://github.com/mustiikhalil/flatbuffers.git', :tag => s.version.to_s, :submodules => true }
+  s.source           = { :git => 'https://github.com/google/flatbuffers.git', :tag => s.version.to_s, :submodules => true }
 
   s.ios.deployment_target = '11.0'
   s.osx.deployment_target = '10.14'
 
   s.swift_version = '5.0'
-  s.source_files = 'Sources/Flatbuffers/*.swift'
+  s.source_files = 'swift/Sources/Flatbuffers/*.swift'
 end
diff --git a/swift/Package.swift b/Package.swift
similarity index 96%
rename from swift/Package.swift
rename to Package.swift
index d2d2d5c6f07e..83d64f4c32bb 100644
--- a/swift/Package.swift
+++ b/Package.swift
@@ -32,5 +32,6 @@ let package = Package(
     .target(
       name: "FlatBuffers",
       dependencies: [],
+      path: "swift/Sources/Flatbuffers",
       exclude: ["Documentation.docc/Resources/code/swift"]),
   ])
diff --git a/swift/Package@swift-5.5.swift b/Package@swift-5.5.swift
similarity index 93%
rename from swift/Package@swift-5.5.swift
rename to Package@swift-5.5.swift
index 3cfdcf6024d9..0dc8262acfb4 100644
--- a/swift/Package@swift-5.5.swift
+++ b/Package@swift-5.5.swift
@@ -31,6 +31,7 @@ let package = Package(
   targets: [
     .target(
       name: "FlatBuffers",
-      dependencies: []),
+      dependencies: [],
+      path: "swift/Sources/Flatbuffers")
   ])
 
diff --git a/tests/swift/Wasm.tests/Package.swift b/tests/swift/Wasm.tests/Package.swift
index 6d3b1645a6e0..bd32307ef1d5 100644
--- a/tests/swift/Wasm.tests/Package.swift
+++ b/tests/swift/Wasm.tests/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../swift"),
+    .package(path: "../../.."),
   ],
   targets: [
     .target(
diff --git a/tests/swift/benchmarks/Package.swift b/tests/swift/benchmarks/Package.swift
index d7114932b720..c4913b784acb 100644
--- a/tests/swift/benchmarks/Package.swift
+++ b/tests/swift/benchmarks/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../swift"),
+    .package(path: "../../.."),
     .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
   ],
   targets: [
diff --git a/tests/swift/tests/Package.swift b/tests/swift/tests/Package.swift
index 64fcd540297b..8b91712b4dc6 100644
--- a/tests/swift/tests/Package.swift
+++ b/tests/swift/tests/Package.swift
@@ -24,7 +24,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../swift"),
+    .package(path: "../../.."),
     .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1"),
   ],
   targets: [