Commented out RHVoiceSwift until proper C++ interoperability will be …

…available for Swift

.github/workflows/build.yml

@@ -20,6 +20,7 @@ jobs:
  with:
  clean: true
  submodules: recursive
- - run: |
+ - name: Build
+ run: |
  rm -fr .build | echo "Removed build folder"
- swift build -c release --target RHVoiceSwift
+ swift build -c release --target RHVoice

Package.swift

@@ -2,8 +2,8 @@
 
 // Copyright (C) 2022 Olga Yakovleva <olga@rhvoice.org>
 
-import PackageDescription
 import Foundation
+import PackageDescription
 
 func boostHeadersPaths() -> [String] {
  let packageURL = URL(fileURLWithPath: #file).deletingLastPathComponent()
@@ -81,8 +81,6 @@ let package = Package(
  .plugin(name: "PackDataPlugin", targets: [
  "PackDataPlugin"
  ]),
- .library(name: "RHVoiceSwift",
- targets: ["RHVoiceSwift"])
  ],
  dependencies: [
  ],
@@ -152,47 +150,6 @@ let package = Package(
  .linkedFramework("AVFAudio")
  ]
  ),
- .target(name: "RHVoiceSwift",
- dependencies: [
- .target(name: "RHVoice"),
- .target(name: "PlayerLib")
- ],
- path: "Sources/RHVoiceSwift",
- cSettings: ([
- .headerSearchPath("../Mock")
- ]
- + commonCSettings(prefix: "../../RHVoice/")
- ),
- swiftSettings: [
- .interoperabilityMode(.Cxx)
- ]
- ),
- .target(name: "PlayerLib",
- dependencies: [
- .target(name: "RHVoice")
- ],
- path: "Sources/PlayerLib",
- cSettings: ([
- .headerSearchPath("../Mock")
- ]
- + commonCSettings(prefix: "../../RHVoice/")
- )
- ),
- .executableTarget(
- name: "RHVoiceSwiftSample",
- dependencies: [
- .target(name: "RHVoiceSwift")
- ],
- path: "Sources/RHVoiceSwiftSample",
- cSettings: ([
- .headerSearchPath("../Mock")
- ]
- + commonCSettings(prefix: "../../RHVoice/")
- ),
- swiftSettings: [
- .interoperabilityMode(.Cxx)
- ]
- ),
  /// Plugin to copy languages and voices data files
  .executableTarget(
  name: "PackDataExecutable",
@@ -238,3 +195,54 @@ func versionString(fileName: String) -> String {
 
 let version = versionString(fileName: "RHVoice/SConstruct")
 package.targets.first?.cSettings?.append(.define("VERSION", to: "\(version)"))
+
+#if SWIFT_SUPPORT
+package.products.append(
+ .library(name: "RHVoiceSwift",
+ targets: ["RHVoiceSwift"])
+)
+
+package.targets.append(contentsOf: [
+ .target(name: "RHVoiceSwift",
+ dependencies: [
+ .target(name: "RHVoice"),
+ .target(name: "PlayerLib")
+ ],
+ path: "Sources/RHVoiceSwift",
+ cSettings: ([
+ .headerSearchPath("../Mock")
+ ]
+ + commonCSettings(prefix: "../../RHVoice/")
+ ),
+ swiftSettings: [
+ .interoperabilityMode(.Cxx)
+ ]
+ ),
+ .target(name: "PlayerLib",
+ dependencies: [
+ .target(name: "RHVoice")
+ ],
+ path: "Sources/PlayerLib",
+ cSettings: ([
+ .headerSearchPath("../Mock")
+ ]
+ + commonCSettings(prefix: "../../RHVoice/")
+ )
+ ),
+ .executableTarget(
+ name: "RHVoiceSwiftSample",
+ dependencies: [
+ .target(name: "RHVoiceSwift")
+ ],
+ path: "Sources/RHVoiceSwiftSample",
+ cSettings: ([
+ .headerSearchPath("../Mock")
+ ]
+ + commonCSettings(prefix: "../../RHVoice/")
+ ),
+ swiftSettings: [
+ .interoperabilityMode(.Cxx)
+ ]
+ )
+])
+#endif

Sources/PlayerLib/include/module.modulemap

@@ -0,0 +1,5 @@
+ module PlayerLib {
+ header "FilePlaybackStream.h"
+
+ requires cplusplus
+}

Sources/RHVoiceSwift/RHSpeechSynthesizer.swift

@@ -104,7 +104,7 @@ public class RHSpeechSynthesizer {
  _ = RHVoice_speak(message)
  }
 
- var rhVoiceEngine: RHVoice_tts_engine?
+ private var rhVoiceEngine: RHVoice_tts_engine?
 
  public static var shared: RHSpeechSynthesizer = {
  let instance = RHSpeechSynthesizer(params: .default)
@@ -125,10 +125,10 @@ public class RHSpeechSynthesizer {
 #endif
  }
 
- var fileStream: PlayerLib.FilePlaybackStream?
+ private var fileStream: PlayerLib.FilePlaybackStream?
 #if canImport(AVFoundation)
- var player: AVPlayer?
- var playerContinuation: CheckedContinuation<Void, any Error>?
+ private var player: AVPlayer?
+ private var playerContinuation: CheckedContinuation<Void, any Error>?
 #endif
 }