Fixes bazel breaking due to new project structure

mustiikhalil · mustiikhalil · commit 5f69992aed57 · 2025-06-15T09:20:20.000+02:00
Address warnings within the library
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,7 @@ import PackageDescription
 let package = Package(
   name: "FlatBuffers",
   platforms: [
-    .iOS(.v11),
+    .iOS(.v12),
     .macOS(.v10_14),
   ],
   products: [
diff --git a/grpc/examples/swift/Greeter/Package.swift b/grpc/examples/swift/Greeter/Package.swift
@@ -20,7 +20,7 @@ import PackageDescription
 let package = Package(
   name: "Greeter",
   platforms: [
-    .iOS(.v11),
+    .iOS(.v12),
     .macOS(.v10_14),
   ],
   dependencies: [
diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
@@ -1,8 +1,21 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
+swift_library(
+    name = "FlexBuffers",
+    srcs = glob([
+        "Sources/FlexBuffers/**/*.swift",
+        "Sources/Common/*.swift",
+    ]),
+    module_name = "FlexBuffers",
+    visibility = ["//visibility:public"],
+)
+
 swift_library(
     name = "swift",
-    srcs = glob(["Sources/FlatBuffers/*.swift"]),
+    srcs = glob([
+        "Sources/FlatBuffers/*.swift",
+        "Sources/Common/*.swift",
+    ]),
     module_name = "FlatBuffers",
     visibility = ["//visibility:public"],
 )
diff --git a/swift/Sources/Common/Int+extension.swift b/swift/Sources/Common/Int+extension.swift
@@ -22,6 +22,7 @@ extension Int {
   ///
   /// This is used since the UnsafeMutableRawPointer will face issues when writing/reading
   /// if the buffer alignment exceeds that actual size of the buffer
+  @inline(__always)
   public var convertToPowerofTwo: Int {
     guard self > 0 else { return 1 }
     var n = UInt32(self)
diff --git a/swift/Sources/Common/Scalar.swift b/swift/Sources/Common/Scalar.swift
diff --git a/swift/Sources/Common/padding.swift b/swift/Sources/Common/padding.swift
diff --git a/swift/Sources/FlatBuffers/ByteBuffer.swift b/swift/Sources/FlatBuffers/ByteBuffer.swift
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import Common
 import Foundation
 
 /// `ByteBuffer` is the interface that stores the data for a `Flatbuffers` object
@@ -294,7 +293,7 @@ public struct ByteBuffer {
     }
     assert(index < _storage.capacity, "Write index is out of writing bound")
     assert(index >= 0, "Writer index should be above zero")
-    _ = withUnsafePointer(to: value) { ptr in
+    withUnsafePointer(to: value) { ptr in
       _storage.withUnsafeRawPointer {
         memcpy(
           $0.advanced(by: index),
diff --git a/swift/Sources/FlatBuffers/Constants.swift b/swift/Sources/FlatBuffers/Constants.swift
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#if canImport(Common)
 @_exported import Common
+#endif
 import Foundation
 
 /// Type aliases
diff --git a/swift/Sources/FlatBuffers/FlatBufferBuilder.swift b/swift/Sources/FlatBuffers/FlatBufferBuilder.swift
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import Common
 import Foundation
 
 /// ``FlatBufferBuilder`` builds a `FlatBuffer` through manipulating its internal state.
diff --git a/swift/Sources/FlatBuffers/Table.swift b/swift/Sources/FlatBuffers/Table.swift
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import Common
 import Foundation
 
 /// `Table` is a Flatbuffers object that can read,
diff --git a/swift/Sources/FlatBuffers/_InternalByteBuffer.swift b/swift/Sources/FlatBuffers/_InternalByteBuffer.swift
@@ -253,7 +253,7 @@ struct _InternalByteBuffer {
     }
     assert(index < _storage.capacity, "Write index is out of writing bound")
     assert(index >= 0, "Writer index should be above zero")
-    _ = withUnsafePointer(to: value) {
+    withUnsafePointer(to: value) {
       memcpy(
         _storage.memory.advanced(by: index),
         $0,
diff --git a/swift/Sources/FlexBuffers/ByteBuffer.swift b/swift/Sources/FlexBuffers/ByteBuffer.swift
@@ -293,7 +293,7 @@ public struct ByteBuffer {
     }
     assert(index < _storage.capacity, "Write index is out of writing bound")
     assert(index >= 0, "Writer index should be above zero")
-    _ = withUnsafePointer(to: value) { ptr in
+    withUnsafePointer(to: value) { ptr in
       _storage.withUnsafeRawPointer {
         memcpy(
           $0.advanced(by: index),
diff --git a/swift/Sources/FlexBuffers/Reader/Map.swift b/swift/Sources/FlexBuffers/Reader/Map.swift
@@ -40,8 +40,6 @@ public struct Map: Sized {
 
   @inline(__always)
   public subscript(key: String) -> Reference? {
-    let count = keys.count
-    let mid = count / 2
     guard let position = binarySearch(vector: keys, target: key)
     else { return nil }
 
diff --git a/swift/Sources/FlexBuffers/Reader/Reference.swift b/swift/Sources/FlexBuffers/Reader/Reference.swift
@@ -41,7 +41,7 @@ public func getRoot(buffer: ByteBuffer) throws -> Reference? {
 
 @inline(__always)
 public func getRootChecked(buffer: ByteBuffer) throws -> Reference? {
-  #warning("TODO: Implement")
+  // TODO(mustiikhalil): implement verifier
   return try getRoot(buffer: buffer)
 }
 
diff --git a/swift/Sources/FlexBuffers/Utils/Constants.swift b/swift/Sources/FlexBuffers/Utils/Constants.swift
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#if canImport(Common)
 @_exported import Common
+#endif
 import Foundation
 
 extension UInt64 {
diff --git a/swift/Sources/FlexBuffers/Utils/Value.swift b/swift/Sources/FlexBuffers/Utils/Value.swift
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import Common
 import Foundation
 
 public struct Value: Equatable {
diff --git a/swift/Sources/FlexBuffers/Writer/FlexBuffersWriter.swift b/swift/Sources/FlexBuffers/Writer/FlexBuffersWriter.swift
@@ -716,8 +716,15 @@ public struct FlexBuffersWriter {
 
     let byteWidth = align(width: bitWidth)
 
+    let currentSize: Int = count &* step &* byteWidth
+    let requiredSize: Int = if !typed {
+      currentSize &* prefixElements
+    } else {
+      currentSize
+    }
+
     _bb.ensureSpace(
-      size: count &* step &* byteWidth)
+      size: requiredSize)
 
     if keys != nil {
       write(offset: keys!.u, byteWidth: byteWidth)
@@ -757,14 +764,14 @@ public struct FlexBuffersWriter {
   private mutating func write(offset: UInt64, byteWidth: Int) {
     let offset: UInt64 = numericCast(writerIndex) &- offset
     assert(byteWidth == 8 || offset < UInt64.one << (byteWidth * 8))
-    _ = withUnsafePointer(to: offset) {
+    withUnsafePointer(to: offset) {
       _bb.writeBytes($0, len: byteWidth)
     }
   }
 
   @inline(__always)
   private mutating func write<T>(value: T, byteWidth: Int) where T: Scalar {
-    _ = withUnsafePointer(to: value) {
+    withUnsafePointer(to: value) {
       _bb.writeBytes($0, len: byteWidth)
     }
   }
diff --git a/swift/Sources/FlexBuffers/_InternalByteBuffer.swift b/swift/Sources/FlexBuffers/_InternalByteBuffer.swift
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import Common
 import Foundation
 
 /// `ByteBuffer` is the interface that stores the data for a `Flatbuffers` object
@@ -162,7 +161,7 @@ struct _InternalByteBuffer {
   }
 
   mutating func write<T>(_ v: T, len: Int) {
-    _ = withUnsafePointer(to: v) {
+    withUnsafePointer(to: v) {
       memcpy(
         _storage.memory.advanced(by: writerIndex),
         $0,
diff --git a/tests/swift/tests/Package.swift b/tests/swift/tests/Package.swift
@@ -20,7 +20,7 @@ import PackageDescription
 let package = Package(
   name: "FlatBuffers.Test.Swift",
   platforms: [
-    .iOS(.v11),
+    .iOS(.v12),
     .macOS(.v10_14),
   ],
   dependencies: [
