Renames Swift Package to WalletCoreSwiftProtobuf

Package.swift

@@ -6,7 +6,7 @@ let package = Package(
     platforms: [.iOS(.v13)],
     products: [
         .library(name: "WalletCore", targets: ["WalletCore"]),
-        .library(name: "SwiftProtobuf", targets: ["SwiftProtobuf"])
+        .library(name: "WalletCoreSwiftProtobuf", targets: ["WalletCoreSwiftProtobuf"])
     ],
     dependencies: [],
     targets: [
@@ -16,7 +16,7 @@ let package = Package(
             checksum: "651894a9418fdd33ae5374367a6a64a57fa92b6e6ffb2d6723c319da97472cb4"
         ),
         .binaryTarget(
-            name: "SwiftProtobuf",
+            name: "WalletCoreSwiftProtobuf",
             url: "https://github.com/trustwallet/wallet-core/releases/download/4.2.9/SwiftProtobuf.xcframework.zip",
             checksum: "946efd4b0132b92208335902e0b65e0aba2d11b9dd6f6d79cc8318e2530c9ae0"
         )

README.md

@@ -73,7 +73,7 @@ Then add libraries to target's `dependencies`:
 
 ```swift
 .product(name: "WalletCore", package: "WalletCore"),
-.product(name: "SwiftProtobuf", package: "WalletCore"),
+.product(name: "WalletCoreSwiftProtobuf", package: "WalletCore"),
 ```
 
 ### CocoaPods

WalletCoreSwiftProtobuf.podspec

@@ -0,0 +1,22 @@
+# Original podspec:
+# https://github.com/apple/swift-protobuf/blob/main/SwiftProtobuf.podspec
+Pod::Spec.new do |s|
+    s.name = 'WalletCoreSwiftProtobuf'
+    s.version = '1.29.0'
+    s.license = { :type => 'Apache 2.0', :file => 'LICENSE.txt' }
+    s.summary = 'Swift Protobuf Runtime Library'
+    s.homepage = 'https://github.com/apple/swift-protobuf'
+    s.author = 'Apple Inc.'
+    s.source = { :git => 'https://github.com/apple/swift-protobuf.git', :tag => s.version }
+
+    s.requires_arc = true
+    s.ios.deployment_target = '11.0'
+    s.osx.deployment_target = '10.13'
+
+    s.cocoapods_version = '>= 1.13.0'
+
+    s.source_files = 'Sources/SwiftProtobuf/**/*.swift'
+    s.resource_bundle = {'WalletCoreSwiftProtobuf' => ['Sources/SwiftProtobuf/PrivacyInfo.xcprivacy']}
+
+    s.swift_versions = ['5.0']
+end

swift/Playground.playground/Contents.swift

@@ -4,7 +4,7 @@
 
 import UIKit
 import TrustWalletCore
-import SwiftProtobuf
+import WalletCoreSwiftProtobuf
 
 enum PlaygroundError: Error {
     case invalidHexString

swift/Podfile

@@ -9,7 +9,7 @@ project 'TrustWalletCore.xcodeproj'
 target 'WalletCore' do
   use_frameworks!
 
-  pod 'SwiftProtobuf'
+  pod 'WalletCoreSwiftProtobuf'
 
   target 'WalletCoreTests'
 end

swift/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - SwiftProtobuf (1.13.0)
+  - WalletCoreSwiftProtobuf (1.29.0)
 
 DEPENDENCIES:
-  - SwiftProtobuf
+  - WalletCoreSwiftProtobuf
 
 SPEC REPOS:
   trunk:
-    - SwiftProtobuf
+    - WalletCoreSwiftProtobuf
 
 SPEC CHECKSUMS:
-  SwiftProtobuf: fd4693388a96c8c2df35d3b063272b0e7c499d00
+  WalletCoreSwiftProtobuf: a4798576a2d309511fc45f81843d348732ec571d
 
-PODFILE CHECKSUM: aac2324ba35cdd5631cb37618cd483887bab9cfd
+PODFILE CHECKSUM: 1112f54f83017d2c0c1d9d4bf5c21f65c5187d0e
 
 COCOAPODS: 1.16.2

swift/Sources/AnySigner.swift

@@ -5,7 +5,7 @@
 // file LICENSE at the root of the source code distribution tree.
 
 import Foundation
-import SwiftProtobuf
+import WalletCoreSwiftProtobuf
 
 public typealias SigningInput = Message
 public typealias SigningOutput = Message
@@ -22,7 +22,7 @@ public final class AnySigner {
     public static func sign<SigningOutput: Message>(input: SigningInput, coin: CoinType) -> SigningOutput {
         do {
             let outputData = nativeSign(data: try input.serializedData(), coin: coin)
-            return try SigningOutput(serializedData: outputData)
+            return try SigningOutput(serializedBytes: outputData)
         } catch let error {
             fatalError(error.localizedDescription)
         }
@@ -72,7 +72,7 @@ public final class AnySigner {
     public static func plan<TransactionPlan: Message>(input: SigningInput, coin: CoinType) -> TransactionPlan {
         do {
             let outputData = nativePlan(data: try input.serializedData(), coin: coin)
-            return try TransactionPlan(serializedData: outputData)
+            return try TransactionPlan(serializedBytes: outputData)
         } catch let error {
             fatalError(error.localizedDescription)
         }

swift/fastlane/Fastfile

@@ -23,7 +23,7 @@ platform :ios do
   lane :swift_protobuf_xcframework do
     create_xcframework(
       workspace: 'TrustWalletCore.xcworkspace',
-      scheme: 'SwiftProtobuf',
+      scheme: 'WalletCoreSwiftProtobuf',
       destinations: ['iOS'],
       xcframework_output_directory: 'build',
       enable_bitcode: false

tools/generate-files

@@ -69,6 +69,9 @@ tools/doxygen_convert_comments
 
 if [ -x "$(command -v protoc-gen-swift)" ] && isTargetSpecified "ios"; then
     "$PROTOC" -I=$PREFIX/include -I=src/proto --cpp_out=src/proto --java_out=lite:jni/proto --swift_out=swift/Sources/Generated/Protobuf --swift_opt=Visibility=Public src/proto/*.proto
+    # Replace SwiftProtobuf with WalletCoreSwiftProtobuf
+     find swift/Sources/Generated/Protobuf -name "*.swift" -exec sed -i '' 's/import SwiftProtobuf/import WalletCoreSwiftProtobuf/g' {} \;
+     find swift/Sources/Generated/Protobuf -name "*.swift" -exec sed -i '' 's/SwiftProtobuf./WalletCoreSwiftProtobuf./g' {} \;
 else
     "$PROTOC" -I=$PREFIX/include -I=src/proto --cpp_out=src/proto --java_out=lite:jni/proto src/proto/*.proto
 fi

tools/ios-release

@@ -64,7 +64,7 @@ Pod::Spec.new do |s|
       'Sources/Types/*.swift',
       'Sources/Generated/Enums/*.swift',
       'Sources/Generated/Protobuf/*.swift'
-    ss.dependency 'SwiftProtobuf'
+    ss.dependency 'WalletCoreSwiftProtobuf'
   end
   s.subspec 'Core' do |ss|
     ss.vendored_frameworks = '*.xcframework'

tools/ios-xcframework

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This script builds dynamic WalletCore and SwiftProtobuf xcframework for SPM and CocoaPods
+# This script builds dynamic WalletCore and WalletCoreSwiftProtobuf xcframework for SPM and CocoaPods
 #
 
 set -e

tools/ios-xcframework-release

@@ -16,8 +16,8 @@ pushd ${base_dir}/../swift/build
 # archive xcframeworks
 core_zip_filename="WalletCore.xcframework.zip"
 core_dsyms_filename="WalletCore.xcframework.dSYM.zip"
-protobuf_zip_filename="SwiftProtobuf.xcframework.zip"
-protobuf_dsyms_filename="SwiftProtobuf.xcframework.dSYM.zip"
+protobuf_zip_filename="WalletCoreSwiftProtobuf.xcframework.zip"
+protobuf_dsyms_filename="WalletCoreSwiftProtobuf.xcframework.dSYM.zip"
 
 rm -rf ${core_zip_filename} ${core_dsyms_filename} ${protobuf_zip_filename} ${protobuf_dsyms_filename}
 
@@ -26,9 +26,9 @@ zip -r ${core_dsyms_filename} WalletCore.dSYMs
 zip -r ${core_zip_filename} WalletCore.xcframework
 core_hash=$(/usr/bin/shasum -a 256 ${core_zip_filename} | awk '{printf $1}')
 
-zip -r ${protobuf_dsyms_filename} SwiftProtobuf.dSYMs
+zip -r ${protobuf_dsyms_filename} WalletCoreSwiftProtobuf.dSYMs
 
-zip -r ${protobuf_zip_filename} SwiftProtobuf.xcframework
+zip -r ${protobuf_zip_filename} WalletCoreSwiftProtobuf.xcframework
 protobuf_hash=$(/usr/bin/shasum -a 256 ${protobuf_zip_filename} | awk '{printf $1}')
 
 # upload to release
@@ -52,7 +52,7 @@ let package = Package(
     platforms: [.iOS(.v13)],
     products: [
         .library(name: "WalletCore", targets: ["WalletCore"]),
-        .library(name: "SwiftProtobuf", targets: ["SwiftProtobuf"])
+        .library(name: "WalletCoreSwiftProtobuf", targets: ["WalletCoreSwiftProtobuf"])
     ],
     dependencies: [],
     targets: [
@@ -62,7 +62,7 @@ let package = Package(
             checksum: "${core_hash}"
         ),
         .binaryTarget(
-            name: "SwiftProtobuf",
+            name: "WalletCoreSwiftProtobuf",
             url: ${protobuf_download_url},
             checksum: "${protobuf_hash}"
         )