Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moves swift package to root of repository so it can be used directly … #7548

Merged
merged 2 commits into from Sep 27, 2022
Merged

Moves swift package to root of repository so it can be used directly … #7548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7322d7
Moves swift package to root of repository so it can be used directly …
mustiikhalil Sep 24, 2022
11d2270
Update swift readme
mustiikhalil Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions swift/FlatBuffers.podspec → FlatBuffers.podspec
View file
Open in desktop
Expand Up @@ -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
1 change: 1 addition & 0 deletions swift/Package.swift → Package.swift
View file
Open in desktop
Expand Up @@ -32,5 +32,6 @@ let package = Package(
.target(
name: "FlatBuffers",
dependencies: [],
path: "swift/Sources",
exclude: ["Documentation.docc/Resources/code/swift"]),
])
3 changes: 2 additions & 1 deletion swift/Package@swift-5.5.swift → Package@swift-5.5.swift
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ let package = Package(
targets: [
.target(
name: "FlatBuffers",
dependencies: []),
dependencies: [],
path: "swift/Sources")
])

6 changes: 1 addition & 5 deletions swift/README.md
View file
Open in desktop
@@ -1,15 +1,11 @@
FlatBuffers swift can be found in both SPM

`.package(url: "https://github.com/mustiikhalil/flatbuffers.git", from: "X.Y.Z"),`
`.package(url: "https://github.com/google/flatbuffers.git", from: "X.Y.Z"),`

and Cocoapods

`pod 'FlatBuffers'`

### Notes

1- To report any error please use the main repository.

### Contribute

1- Always run `swift test --generate-linuxmain` whenever new test functions are added or removed
2 changes: 1 addition & 1 deletion tests/swift/Wasm.tests/Package.swift
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ let package = Package(
.macOS(.v10_14),
],
dependencies: [
.package(path: "../../../swift"),
.package(path: "../../.."),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion tests/swift/benchmarks/Package.swift
View file
Open in desktop
Expand Up @@ -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: [
Expand Down
2 changes: 1 addition & 1 deletion tests/swift/tests/Package.swift
View file
Open in desktop
Expand Up @@ -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: [
Expand Down