Update Package manifest to SPM 5.6. FastDDS 2.x.x comparability chang…

…es. Update CI script for Xcode 13.3.1.
DimaRU · Jan 11, 2024 · 7d77149 · 7d77149
1 parent 8bd3bf2
commit 7d77149
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,10 +12,10 @@ on:
 jobs:
     build:
         name: Build
-        runs-on: macOS-latest
+        runs-on: macOS-12
         steps:
         - name: Select Xcode
-          run: xcversion select 12.2
+          run: xcversion select 13.3.1
 
         - name: Check XCode Version
           run: xcodebuild -version

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.6
 
 import PackageDescription
 
@@ -10,18 +10,18 @@ let package = Package(
             targets: ["FastRTPSSwift"]),
     ],
     dependencies: [
-        .package(name: "CDRCodable", url: "https://github.com/DimaRU/CDRCodable.git", from: "1.0.0"),
-        .package(name: "FastDDS", url: "https://github.com/DimaRU/FastDDSPrebuild.git", .upToNextMajor(from: "2.0.0"))
+        .package(url: "https://github.com/DimaRU/CDRCodable.git", from: "1.0.0"),
+        .package(url: "https://github.com/DimaRU/FastDDSPrebuild.git", from: "2.0.0"),
     ],
     targets: [
         .target(
             name: "FastRTPSWrapper",
-            dependencies: ["FastDDS"],
-            path: "Sources/FastRTPSWrapper"),
+            dependencies: [
+                .product(name: "FastDDS", package: "FastDDSPrebuild")
+            ]),
         .target(
             name: "FastRTPSSwift",
-            dependencies: ["CDRCodable", "FastRTPSWrapper"],
-            path: "Sources/FastRTPSBridge"),
+            dependencies: ["CDRCodable", "FastRTPSWrapper"]),
         .testTarget(
             name: "FastRTPSSwiftTests",
             dependencies: ["FastRTPSSwift"]),

diff --git a/Sources/FastRTPSWrapper/BridgedReaderListener.h b/Sources/FastRTPSWrapper/BridgedReaderListener.h
@@ -22,7 +22,7 @@ class BridgedReaderListener:public eprosima::fastrtps::rtps::ReaderListener
     void onReaderMatched(eprosima::fastrtps::rtps::RTPSReader*,
                          eprosima::fastrtps::rtps::MatchingInfo& info) override;
     void on_liveliness_changed(eprosima::fastrtps::rtps::RTPSReader *reader,
-                               const eprosima::fastrtps::LivelinessChangedStatus &status) override;
+                               const eprosima::fastdds::dds::LivelinessChangedStatus &status) override;
 
     const void * payloadDecoder;
     uint32_t n_matched;