From c049c9eac9e8976e6f35b1fcb9f987b00e128c3a Mon Sep 17 00:00:00 2001 From: Alex Vlasov Date: Fri, 10 Aug 2018 21:02:28 +0300 Subject: [PATCH] update podspec --- .../libsodium-iOS/libsodium-iOS-prefix.pch | 12 ------------ .../libsodium-macOS/libsodium-macOS-prefix.pch | 12 ------------ .../scrypt/scrypt/scrypt}/BufferStorage.swift | 0 .../scrypt/scrypt/scrypt}/Salsa.swift | 0 .../scrypt/scrypt/scrypt}/Scrypt.swift | 3 +-- web3swift.podspec | 4 ++-- 6 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 Pods/Target Support Files/libsodium-iOS/libsodium-iOS-prefix.pch delete mode 100644 Pods/Target Support Files/libsodium-macOS/libsodium-macOS-prefix.pch rename {web3swift/Scrypt/Classes => Pods/scrypt/scrypt/scrypt}/BufferStorage.swift (100%) rename {web3swift/Scrypt/Classes => Pods/scrypt/scrypt/scrypt}/Salsa.swift (100%) rename {web3swift/Scrypt/Classes => Pods/scrypt/scrypt/scrypt}/Scrypt.swift (99%) diff --git a/Pods/Target Support Files/libsodium-iOS/libsodium-iOS-prefix.pch b/Pods/Target Support Files/libsodium-iOS/libsodium-iOS-prefix.pch deleted file mode 100644 index beb2a244..00000000 --- a/Pods/Target Support Files/libsodium-iOS/libsodium-iOS-prefix.pch +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - diff --git a/Pods/Target Support Files/libsodium-macOS/libsodium-macOS-prefix.pch b/Pods/Target Support Files/libsodium-macOS/libsodium-macOS-prefix.pch deleted file mode 100644 index 082f8af2..00000000 --- a/Pods/Target Support Files/libsodium-macOS/libsodium-macOS-prefix.pch +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - diff --git a/web3swift/Scrypt/Classes/BufferStorage.swift b/Pods/scrypt/scrypt/scrypt/BufferStorage.swift similarity index 100% rename from web3swift/Scrypt/Classes/BufferStorage.swift rename to Pods/scrypt/scrypt/scrypt/BufferStorage.swift diff --git a/web3swift/Scrypt/Classes/Salsa.swift b/Pods/scrypt/scrypt/scrypt/Salsa.swift similarity index 100% rename from web3swift/Scrypt/Classes/Salsa.swift rename to Pods/scrypt/scrypt/scrypt/Salsa.swift diff --git a/web3swift/Scrypt/Classes/Scrypt.swift b/Pods/scrypt/scrypt/scrypt/Scrypt.swift similarity index 99% rename from web3swift/Scrypt/Classes/Scrypt.swift rename to Pods/scrypt/scrypt/scrypt/Scrypt.swift index 0e206b5f..ef491353 100644 --- a/web3swift/Scrypt/Classes/Scrypt.swift +++ b/Pods/scrypt/scrypt/scrypt/Scrypt.swift @@ -8,10 +8,9 @@ // https://www.ietf.org/rfc/rfc7914.txt // - -import Foundation import CryptoSwift + /// A key derivation function. /// /// Scrypt - Password-Based Key Derivation Function. Key stretching technique. diff --git a/web3swift.podspec b/web3swift.podspec index 07988fd4..7c24ca4d 100644 --- a/web3swift.podspec +++ b/web3swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "web3swift" -s.version = "1.1.1" +s.version = "1.1.5" s.summary = "Web3 implementation in vanilla Swift for iOS ans macOS" s.description = <<-DESC @@ -27,5 +27,5 @@ s.dependency 'Result', '~> 3.0' s.dependency 'CryptoSwift', '~> 0.11' s.dependency 'secp256k1_ios', '~> 0.1' s.dependency 'PromiseKit', '~> 6.3' -s.dependency 'scrypt-cryptoswift', '~> 1.2' +s.dependency 'scrypt', '~> 1.5' end