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 6cac776 chore: move ArrowC to the standard multi-target layout (#102)
6cac776 is described below
commit 6cac776ef04b4cd1f8512a393ce28614269809c8
Author: willtemperley <[email protected]>
AuthorDate: Wed Nov 19 09:00:11 2025 +0800
chore: move ArrowC to the standard multi-target layout (#102)
## What's Changed
./Arrow/Sources/Arrow/ArrowC has been moved to ./Sources/ArrowC
This is the standard multi-target layout, meaning the path:
`Arrow/Sources/ArrowC` on the ArrowC target is no longer necessary,
therefore the path has been removed.
Contributes toward closing: #78
Closes #98.
---
.swiftlint.yml | 10 +++++-----
Package.swift | 3 ---
{Arrow/Sources => Sources}/Arrow/ArrowArray.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowArrayBuilder.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowBuffer.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowBufferBuilder.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowCExporter.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowCImporter.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowData.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowDecoder.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowEncoder.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowReader.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowReaderHelper.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowSchema.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowTable.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowType.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowWriter.swift | 0
{Arrow/Sources => Sources}/Arrow/ArrowWriterHelper.swift | 0
{Arrow/Sources => Sources}/Arrow/BitUtility.swift | 0
{Arrow/Sources => Sources}/Arrow/ChunkedArray.swift | 0
{Arrow/Sources => Sources}/Arrow/File_generated.swift | 0
{Arrow/Sources => Sources}/Arrow/MemoryAllocator.swift | 0
{Arrow/Sources => Sources}/Arrow/Message_generated.swift | 0
{Arrow/Sources => Sources}/Arrow/ProtoUtil.swift | 0
{Arrow/Sources => Sources}/Arrow/Schema_generated.swift | 0
{Arrow/Sources => Sources}/Arrow/SparseTensor_generated.swift | 0
{Arrow/Sources => Sources}/Arrow/Tensor_generated.swift | 0
{Arrow/Sources => Sources}/ArrowC/ArrowCData.c | 0
{Arrow/Sources => Sources}/ArrowC/include/ArrowCData.h | 0
29 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 7e4da29..3615749 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -25,11 +25,11 @@ included:
- CDataWGo/Package.swift
- CDataWGo/Sources/go-swift
excluded:
- - Arrow/Sources/Arrow/File_generated.swift
- - Arrow/Sources/Arrow/Message_generated.swift
- - Arrow/Sources/Arrow/Schema_generated.swift
- - Arrow/Sources/Arrow/SparseTensor_generated.swift
- - Arrow/Sources/Arrow/Tensor_generated.swift
+ - Sources/Arrow/File_generated.swift
+ - Sources/Arrow/Message_generated.swift
+ - 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
diff --git a/Package.swift b/Package.swift
index b631c7f..a98af60 100644
--- a/Package.swift
+++ b/Package.swift
@@ -39,11 +39,9 @@ let package = Package(
targets: [
.target(
name: "ArrowC",
- path: "Arrow/Sources/ArrowC",
swiftSettings: [
// build: .unsafeFlags(["-warnings-as-errors"])
]
-
),
.target(
name: "Arrow",
@@ -51,7 +49,6 @@ let package = Package(
.product(name: "FlatBuffers", package:
"flatbuffers"),
.product(name: "Atomics", package: "swift-atomics")
],
- path: "Arrow/Sources/Arrow",
swiftSettings: [
// build: .unsafeFlags(["-warnings-as-errors"])
]
diff --git a/Arrow/Sources/Arrow/ArrowArray.swift
b/Sources/Arrow/ArrowArray.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowArray.swift
rename to Sources/Arrow/ArrowArray.swift
diff --git a/Arrow/Sources/Arrow/ArrowArrayBuilder.swift
b/Sources/Arrow/ArrowArrayBuilder.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowArrayBuilder.swift
rename to Sources/Arrow/ArrowArrayBuilder.swift
diff --git a/Arrow/Sources/Arrow/ArrowBuffer.swift
b/Sources/Arrow/ArrowBuffer.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowBuffer.swift
rename to Sources/Arrow/ArrowBuffer.swift
diff --git a/Arrow/Sources/Arrow/ArrowBufferBuilder.swift
b/Sources/Arrow/ArrowBufferBuilder.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowBufferBuilder.swift
rename to Sources/Arrow/ArrowBufferBuilder.swift
diff --git a/Arrow/Sources/Arrow/ArrowCExporter.swift
b/Sources/Arrow/ArrowCExporter.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowCExporter.swift
rename to Sources/Arrow/ArrowCExporter.swift
diff --git a/Arrow/Sources/Arrow/ArrowCImporter.swift
b/Sources/Arrow/ArrowCImporter.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowCImporter.swift
rename to Sources/Arrow/ArrowCImporter.swift
diff --git a/Arrow/Sources/Arrow/ArrowData.swift b/Sources/Arrow/ArrowData.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowData.swift
rename to Sources/Arrow/ArrowData.swift
diff --git a/Arrow/Sources/Arrow/ArrowDecoder.swift
b/Sources/Arrow/ArrowDecoder.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowDecoder.swift
rename to Sources/Arrow/ArrowDecoder.swift
diff --git a/Arrow/Sources/Arrow/ArrowEncoder.swift
b/Sources/Arrow/ArrowEncoder.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowEncoder.swift
rename to Sources/Arrow/ArrowEncoder.swift
diff --git a/Arrow/Sources/Arrow/ArrowReader.swift
b/Sources/Arrow/ArrowReader.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowReader.swift
rename to Sources/Arrow/ArrowReader.swift
diff --git a/Arrow/Sources/Arrow/ArrowReaderHelper.swift
b/Sources/Arrow/ArrowReaderHelper.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowReaderHelper.swift
rename to Sources/Arrow/ArrowReaderHelper.swift
diff --git a/Arrow/Sources/Arrow/ArrowSchema.swift
b/Sources/Arrow/ArrowSchema.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowSchema.swift
rename to Sources/Arrow/ArrowSchema.swift
diff --git a/Arrow/Sources/Arrow/ArrowTable.swift
b/Sources/Arrow/ArrowTable.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowTable.swift
rename to Sources/Arrow/ArrowTable.swift
diff --git a/Arrow/Sources/Arrow/ArrowType.swift b/Sources/Arrow/ArrowType.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowType.swift
rename to Sources/Arrow/ArrowType.swift
diff --git a/Arrow/Sources/Arrow/ArrowWriter.swift
b/Sources/Arrow/ArrowWriter.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowWriter.swift
rename to Sources/Arrow/ArrowWriter.swift
diff --git a/Arrow/Sources/Arrow/ArrowWriterHelper.swift
b/Sources/Arrow/ArrowWriterHelper.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ArrowWriterHelper.swift
rename to Sources/Arrow/ArrowWriterHelper.swift
diff --git a/Arrow/Sources/Arrow/BitUtility.swift
b/Sources/Arrow/BitUtility.swift
similarity index 100%
rename from Arrow/Sources/Arrow/BitUtility.swift
rename to Sources/Arrow/BitUtility.swift
diff --git a/Arrow/Sources/Arrow/ChunkedArray.swift
b/Sources/Arrow/ChunkedArray.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ChunkedArray.swift
rename to Sources/Arrow/ChunkedArray.swift
diff --git a/Arrow/Sources/Arrow/File_generated.swift
b/Sources/Arrow/File_generated.swift
similarity index 100%
rename from Arrow/Sources/Arrow/File_generated.swift
rename to Sources/Arrow/File_generated.swift
diff --git a/Arrow/Sources/Arrow/MemoryAllocator.swift
b/Sources/Arrow/MemoryAllocator.swift
similarity index 100%
rename from Arrow/Sources/Arrow/MemoryAllocator.swift
rename to Sources/Arrow/MemoryAllocator.swift
diff --git a/Arrow/Sources/Arrow/Message_generated.swift
b/Sources/Arrow/Message_generated.swift
similarity index 100%
rename from Arrow/Sources/Arrow/Message_generated.swift
rename to Sources/Arrow/Message_generated.swift
diff --git a/Arrow/Sources/Arrow/ProtoUtil.swift b/Sources/Arrow/ProtoUtil.swift
similarity index 100%
rename from Arrow/Sources/Arrow/ProtoUtil.swift
rename to Sources/Arrow/ProtoUtil.swift
diff --git a/Arrow/Sources/Arrow/Schema_generated.swift
b/Sources/Arrow/Schema_generated.swift
similarity index 100%
rename from Arrow/Sources/Arrow/Schema_generated.swift
rename to Sources/Arrow/Schema_generated.swift
diff --git a/Arrow/Sources/Arrow/SparseTensor_generated.swift
b/Sources/Arrow/SparseTensor_generated.swift
similarity index 100%
rename from Arrow/Sources/Arrow/SparseTensor_generated.swift
rename to Sources/Arrow/SparseTensor_generated.swift
diff --git a/Arrow/Sources/Arrow/Tensor_generated.swift
b/Sources/Arrow/Tensor_generated.swift
similarity index 100%
rename from Arrow/Sources/Arrow/Tensor_generated.swift
rename to Sources/Arrow/Tensor_generated.swift
diff --git a/Arrow/Sources/ArrowC/ArrowCData.c b/Sources/ArrowC/ArrowCData.c
similarity index 100%
rename from Arrow/Sources/ArrowC/ArrowCData.c
rename to Sources/ArrowC/ArrowCData.c
diff --git a/Arrow/Sources/ArrowC/include/ArrowCData.h
b/Sources/ArrowC/include/ArrowCData.h
similarity index 100%
rename from Arrow/Sources/ArrowC/include/ArrowCData.h
rename to Sources/ArrowC/include/ArrowCData.h
