Merge pull request #26 from VirgilSecurity/develop

Develop
VirgilSecurity · Nov 4, 2019 · 733d521 · 733d521
2 parents a52f5a3 + 35cad7e
commit 733d521
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,22 @@
 language: objective-c
-osx_image: xcode11
+osx_image: xcode11.2
 
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - PROJECT=VirgilCrypto.xcodeproj
-    - IOS_SDK=iphonesimulator13.0
+    - IOS_SDK=iphonesimulator13.2
     - MACOS_SDK=macosx10.15
-    - TVOS_SDK=appletvsimulator13.0
-    - WATCHOS_SDK=watchsimulator6.0
+    - TVOS_SDK=appletvsimulator13.2
+    - WATCHOS_SDK=watchsimulator6.1
     - CRYPTO_FRAMEWORK_NAME=VirgilCrypto
     - REPO=VirgilSecurity/virgil-crypto-x
   matrix:
     - DESTINATION=""                                         PREFIX=""         SDK=""              BUILD="0"  PUBLISH_CARTHAGE="YES"  CARTHAGE_PLATFORM_NAME="Mac"      PUBLISH_POD="YES"  PUBLISH_DOCS="YES"  SWIFT_LINT="NO"
-    - DESTINATION="OS=13.0,name=iPhone 8"                    PREFIX="iOS"      SDK="$IOS_SDK"      BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="iOS"      PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION="OS=13.2,name=iPhone 8"                    PREFIX="iOS"      SDK="$IOS_SDK"      BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="iOS"      PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
     - DESTINATION="arch=x86_64"                              PREFIX="macOS"    SDK="$MACOS_SDK"    BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="Mac"      PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
-    - DESTINATION="OS=13.0,name=Apple TV 4K"                 PREFIX="tvOS"     SDK="$TVOS_SDK"     BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="tvOS"     PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
-    - DESTINATION="OS=6.0,name=Apple Watch Series 4 - 44mm"  PREFIX="watchOS"  SDK="$WATCHOS_SDK"  BUILD="1"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="watchOS"  PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION="OS=13.2,name=Apple TV 4K"                 PREFIX="tvOS"     SDK="$TVOS_SDK"     BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="tvOS"     PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION="OS=6.1,name=Apple Watch Series 4 - 44mm"  PREFIX="watchOS"  SDK="$WATCHOS_SDK"  BUILD="1"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="watchOS"  PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
 
 before_install:
   - set -e

diff --git a/Source/VirgilCrypto/VirgilCrypto+AuthEncrypt.swift b/Source/VirgilCrypto/VirgilCrypto+AuthEncrypt.swift
@@ -158,12 +158,6 @@ extension VirgilCrypto {
     /// - Parameter privateKey: Recipient's private key
     /// - Parameter signersPublicKeys: Array of possible signers public keys.
     ///                                WARNING: Stream should have signature of ANY public key from array.
-    ///
-    /// - Parameter stream: Input stream
-    /// - Parameter outputStream: Output stream
-    /// - Parameter privateKey: Private key to decrypr
-    /// - Parameter signersPublicKeys: Array of possible signers public keys.
-    ///                                WARNING: Data should have signature of ANY public key from array.
     /// - Throws: Rethrows from `RecipientCipher`.
     @objc open func authDecrypt(_ stream: InputStream, to outputStream: OutputStream,
                                 with privateKey: VirgilPrivateKey,

diff --git a/VirgilCrypto.podspec b/VirgilCrypto.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                        = "VirgilCrypto"
-  s.version                     = "5.2.0"
+  s.version                     = "5.2.1"
   s.swift_version               = "5.0"
   s.license                     = { :type => "BSD", :file => "LICENSE" }
   s.summary                     = "Contains high level crypto operations VirgilCrypto c library."

diff --git a/VirgilCrypto/Info.plist b/VirgilCrypto/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.0</string>
+	<string>5.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>