This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-swift.git
The following commit(s) were added to refs/heads/main by this push:
new 9a35f96 chore: Move ArrowFlight to standard layout (#112)
9a35f96 is described below
commit 9a35f96d9a8daae0ba6ada200f3ea9f7e68b1499
Author: willtemperley <[email protected]>
AuthorDate: Tue Nov 25 12:53:30 2025 +0800
chore: Move ArrowFlight to standard layout (#112)
## What's Changed
ArrowFlight has been moved to Sources/ArrowFlight
ArrowFlightTests has been moved to Tests/ArrowFlight
ArrowFlight/Package.swift has been deleted.
build.sh and lint config have been updated to reflect this structure.
Closes #78.
---
.swiftlint.yml | 12 +-
ArrowFlight/Package.resolved | 195 ---------------------
ArrowFlight/Package.swift | 61 -------
Package.swift | 2 -
.../ArrowFlight/Flight.grpc.swift | 0
.../ArrowFlight/Flight.pb.swift | 0
.../ArrowFlight/FlightAction.swift | 0
.../ArrowFlight/FlightActionType.swift | 0
.../ArrowFlight/FlightClient.swift | 0
.../ArrowFlight/FlightCriteria.swift | 0
.../ArrowFlight/FlightData.swift | 0
.../ArrowFlight/FlightDescriptor.swift | 0
.../ArrowFlight/FlightEndpoint.swift | 0
.../ArrowFlight/FlightInfo.swift | 0
.../ArrowFlight/FlightLocation.swift | 0
.../ArrowFlight/FlightPutResult.swift | 0
.../ArrowFlight/FlightResult.swift | 0
.../ArrowFlight/FlightSchemaResult.swift | 0
.../ArrowFlight/FlightServer.swift | 0
.../ArrowFlight/FlightSql.pb.swift | 0
.../ArrowFlight/FlightTicket.swift | 0
.../ArrowFlight/RecordBatchStreamReader.swift | 0
.../ArrowFlight/RecordBatchStreamWriter.swift | 0
.../ArrowFlightTests/FlightTest.swift | 0
ci/scripts/build.sh | 10 +-
25 files changed, 7 insertions(+), 273 deletions(-)
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 3615749..f261fdd 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -16,12 +16,6 @@
# under the License.
included:
- - Arrow/Package.swift
- - Arrow/Sources
- - Arrow/Tests
- - ArrowFlight/Package.swift
- - ArrowFlight/Sources
- - ArrowFlight/Tests
- CDataWGo/Package.swift
- CDataWGo/Sources/go-swift
excluded:
@@ -30,9 +24,9 @@ excluded:
- Sources/Arrow/Schema_generated.swift
- Sources/Arrow/SparseTensor_generated.swift
- Sources/Arrow/Tensor_generated.swift
- - ArrowFlight/Sources/ArrowFlight/Flight.grpc.swift
- - ArrowFlight/Sources/ArrowFlight/Flight.pb.swift
- - ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift
+ - Sources/ArrowFlight/Flight.grpc.swift
+ - Sources/ArrowFlight/Flight.pb.swift
+ - Sources/ArrowFlight/FlightSql.pb.swift
identifier_name:
min_length: 2 # only warning
allow_zero_lintable_files: false
diff --git a/ArrowFlight/Package.resolved b/ArrowFlight/Package.resolved
deleted file mode 100644
index 351df12..0000000
--- a/ArrowFlight/Package.resolved
+++ /dev/null
@@ -1,195 +0,0 @@
-{
- "originHash" :
"8aa0aeba452ce44a74de9eec71fef142d262ac569314743fc16523e396ae4124",
- "pins" : [
- {
- "identity" : "flatbuffers",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/google/flatbuffers.git";,
- "state" : {
- "branch" : "v25.2.10",
- "revision" : "1c514626e83c20fffa8557e75641848e1e15cd5e"
- }
- },
- {
- "identity" : "grpc-swift",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/grpc/grpc-swift.git";,
- "state" : {
- "revision" : "a56a157218877ef3e9625f7e1f7b2cb7e46ead1b",
- "version" : "1.26.1"
- }
- },
- {
- "identity" : "swift-algorithms",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-algorithms.git";,
- "state" : {
- "revision" : "87e50f483c54e6efd60e885f7f5aa946cee68023",
- "version" : "1.2.1"
- }
- },
- {
- "identity" : "swift-asn1",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-asn1.git";,
- "state" : {
- "revision" : "a54383ada6cecde007d374f58f864e29370ba5c3",
- "version" : "1.3.2"
- }
- },
- {
- "identity" : "swift-async-algorithms",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-async-algorithms.git";,
- "state" : {
- "revision" : "042e1c4d9d19748c9c228f8d4ebc97bb1e339b0b",
- "version" : "1.0.4"
- }
- },
- {
- "identity" : "swift-atomics",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-atomics.git";,
- "state" : {
- "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
- "version" : "1.3.0"
- }
- },
- {
- "identity" : "swift-certificates",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-certificates.git";,
- "state" : {
- "revision" : "999fd70c7803da89f3904d635a6815a2a7cd7585",
- "version" : "1.10.0"
- }
- },
- {
- "identity" : "swift-collections",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-collections.git";,
- "state" : {
- "revision" : "c1805596154bb3a265fd91b8ac0c4433b4348fb0",
- "version" : "1.2.0"
- }
- },
- {
- "identity" : "swift-crypto",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-crypto.git";,
- "state" : {
- "revision" : "e8d6eba1fef23ae5b359c46b03f7d94be2f41fed",
- "version" : "3.12.3"
- }
- },
- {
- "identity" : "swift-http-structured-headers",
- "kind" : "remoteSourceControl",
- "location" :
"https://github.com/apple/swift-http-structured-headers.git";,
- "state" : {
- "revision" : "db6eea3692638a65e2124990155cd220c2915903",
- "version" : "1.3.0"
- }
- },
- {
- "identity" : "swift-http-types",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-http-types.git";,
- "state" : {
- "revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
- "version" : "1.4.0"
- }
- },
- {
- "identity" : "swift-log",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-log.git";,
- "state" : {
- "revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
- "version" : "1.6.3"
- }
- },
- {
- "identity" : "swift-nio",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-nio.git";,
- "state" : {
- "revision" : "34d486b01cd891297ac615e40d5999536a1e138d",
- "version" : "2.83.0"
- }
- },
- {
- "identity" : "swift-nio-extras",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-nio-extras.git";,
- "state" : {
- "revision" : "145db1962f4f33a4ea07a32e751d5217602eea29",
- "version" : "1.28.0"
- }
- },
- {
- "identity" : "swift-nio-http2",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-nio-http2.git";,
- "state" : {
- "revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0",
- "version" : "1.36.0"
- }
- },
- {
- "identity" : "swift-nio-ssl",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-nio-ssl.git";,
- "state" : {
- "revision" : "4b38f35946d00d8f6176fe58f96d83aba64b36c7",
- "version" : "2.31.0"
- }
- },
- {
- "identity" : "swift-nio-transport-services",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-nio-transport-services.git";,
- "state" : {
- "revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56",
- "version" : "1.24.0"
- }
- },
- {
- "identity" : "swift-numerics",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-numerics.git";,
- "state" : {
- "revision" : "e0ec0f5f3af6f3e4d5e7a19d2af26b481acb6ba8",
- "version" : "1.0.3"
- }
- },
- {
- "identity" : "swift-protobuf",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-protobuf.git";,
- "state" : {
- "revision" : "102a647b573f60f73afdce5613a51d71349fe507",
- "version" : "1.30.0"
- }
- },
- {
- "identity" : "swift-service-lifecycle",
- "kind" : "remoteSourceControl",
- "location" :
"https://github.com/swift-server/swift-service-lifecycle.git";,
- "state" : {
- "revision" : "e7187309187695115033536e8fc9b2eb87fd956d",
- "version" : "2.8.0"
- }
- },
- {
- "identity" : "swift-system",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-system.git";,
- "state" : {
- "revision" : "61e4ca4b81b9e09e2ec863b00c340eb13497dac6",
- "version" : "1.5.0"
- }
- }
- ],
- "version" : 3
-}
diff --git a/ArrowFlight/Package.swift b/ArrowFlight/Package.swift
deleted file mode 100644
index 581ec45..0000000
--- a/ArrowFlight/Package.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-// swift-tools-version: 5.10
-// The swift-tools-version declares the minimum version of Swift required to
build this package.
-
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-import PackageDescription
-
-let package = Package(
- name: "ArrowFlight",
- platforms: [
- .macOS(.v10_15)
- ],
- products: [
- // Products define the executables and libraries a package produces,
making them visible to other packages.
- .library(
- name: "ArrowFlight",
- targets: ["ArrowFlight"])
- ],
- dependencies: [
- .package(url: "https://github.com/grpc/grpc-swift.git";, from:
"1.25.0"),
- .package(url: "https://github.com/apple/swift-protobuf.git";, from:
"1.29.0"),
- .package(path: "../Arrow")
- ],
- targets: [
- // Targets are the basic building blocks of a package, defining a
module or a test suite.
- // Targets can depend on other targets in this package and products
from dependencies.
- .target(
- name: "ArrowFlight",
- dependencies: [
- .product(name: "Arrow", package: "Arrow"),
- .product(name: "GRPC", package: "grpc-swift"),
- .product(name: "SwiftProtobuf", package: "swift-protobuf")
- ],
- swiftSettings: [
- // build: .unsafeFlags(["-warnings-as-errors"])
- ]
- ),
- .testTarget(
- name: "ArrowFlightTests",
- dependencies: ["ArrowFlight"],
- swiftSettings: [
- // build: .unsafeFlags(["-warnings-as-errors"])
- ]
- )
- ]
-)
diff --git a/Package.swift b/Package.swift
index 09269b2..d1447e0 100644
--- a/Package.swift
+++ b/Package.swift
@@ -60,7 +60,6 @@ let package = Package(
.product(name: "GRPC", package: "grpc-swift"),
.product(name: "SwiftProtobuf", package: "swift-protobuf")
],
- path: "ArrowFlight/Sources/ArrowFlight",
swiftSettings: [
// build: .unsafeFlags(["-warnings-as-errors"])
]
@@ -75,7 +74,6 @@ let package = Package(
.testTarget(
name: "ArrowFlightTests",
dependencies: ["ArrowFlight"],
- path: "ArrowFlight/Tests",
swiftSettings: [
// build: .unsafeFlags(["-warnings-as-errors"])
]
diff --git a/ArrowFlight/Sources/ArrowFlight/Flight.grpc.swift
b/Sources/ArrowFlight/Flight.grpc.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/Flight.grpc.swift
rename to Sources/ArrowFlight/Flight.grpc.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/Flight.pb.swift
b/Sources/ArrowFlight/Flight.pb.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/Flight.pb.swift
rename to Sources/ArrowFlight/Flight.pb.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightAction.swift
b/Sources/ArrowFlight/FlightAction.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightAction.swift
rename to Sources/ArrowFlight/FlightAction.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightActionType.swift
b/Sources/ArrowFlight/FlightActionType.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightActionType.swift
rename to Sources/ArrowFlight/FlightActionType.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightClient.swift
b/Sources/ArrowFlight/FlightClient.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightClient.swift
rename to Sources/ArrowFlight/FlightClient.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightCriteria.swift
b/Sources/ArrowFlight/FlightCriteria.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightCriteria.swift
rename to Sources/ArrowFlight/FlightCriteria.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightData.swift
b/Sources/ArrowFlight/FlightData.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightData.swift
rename to Sources/ArrowFlight/FlightData.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightDescriptor.swift
b/Sources/ArrowFlight/FlightDescriptor.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightDescriptor.swift
rename to Sources/ArrowFlight/FlightDescriptor.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightEndpoint.swift
b/Sources/ArrowFlight/FlightEndpoint.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightEndpoint.swift
rename to Sources/ArrowFlight/FlightEndpoint.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightInfo.swift
b/Sources/ArrowFlight/FlightInfo.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightInfo.swift
rename to Sources/ArrowFlight/FlightInfo.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightLocation.swift
b/Sources/ArrowFlight/FlightLocation.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightLocation.swift
rename to Sources/ArrowFlight/FlightLocation.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightPutResult.swift
b/Sources/ArrowFlight/FlightPutResult.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightPutResult.swift
rename to Sources/ArrowFlight/FlightPutResult.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightResult.swift
b/Sources/ArrowFlight/FlightResult.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightResult.swift
rename to Sources/ArrowFlight/FlightResult.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightSchemaResult.swift
b/Sources/ArrowFlight/FlightSchemaResult.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightSchemaResult.swift
rename to Sources/ArrowFlight/FlightSchemaResult.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightServer.swift
b/Sources/ArrowFlight/FlightServer.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightServer.swift
rename to Sources/ArrowFlight/FlightServer.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift
b/Sources/ArrowFlight/FlightSql.pb.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift
rename to Sources/ArrowFlight/FlightSql.pb.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/FlightTicket.swift
b/Sources/ArrowFlight/FlightTicket.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/FlightTicket.swift
rename to Sources/ArrowFlight/FlightTicket.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/RecordBatchStreamReader.swift
b/Sources/ArrowFlight/RecordBatchStreamReader.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/RecordBatchStreamReader.swift
rename to Sources/ArrowFlight/RecordBatchStreamReader.swift
diff --git a/ArrowFlight/Sources/ArrowFlight/RecordBatchStreamWriter.swift
b/Sources/ArrowFlight/RecordBatchStreamWriter.swift
similarity index 100%
rename from ArrowFlight/Sources/ArrowFlight/RecordBatchStreamWriter.swift
rename to Sources/ArrowFlight/RecordBatchStreamWriter.swift
diff --git a/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift
b/Tests/ArrowFlightTests/FlightTest.swift
similarity index 100%
rename from ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift
rename to Tests/ArrowFlightTests/FlightTest.swift
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index 8f2692c..53dbb7b 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -58,12 +58,10 @@ popd
github_actions_group_end
github_actions_group_begin "Use -warnings-as-errors"
-for package in . ArrowFlight; do
- pushd "${build_dir}/source/${package}"
- sed 's/\/\/ build://g' Package.swift > Package.swift.build
- mv Package.swift.build Package.swift
- popd
-done
+pushd "${build_dir}/source/"
+sed 's/\/\/ build://g' Package.swift > Package.swift.build
+mv Package.swift.build Package.swift
+popd
github_actions_group_end
github_actions_group_begin "Build"
