Merge pull request #71 from VirgilSecurity/develop

v3.0.0
VirgilSecurity · Sep 5, 2021 · 404cdb7 · 404cdb7
2 parents 4e1198b + e07bb20
commit 404cdb7
Show file tree

Hide file tree

Showing 88 changed files with 936 additions and 522 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -13,6 +13,7 @@ disabled_rules:
   - multiline_parameters
   - closure_body_length
   - no_grouping_extension
+  - inclusive_language
 
 opt_in_rules:
   - array_init
@@ -118,7 +119,6 @@ opt_in_rules:
   - unused_enumerated
   - unused_import
   - unused_optional_binding
-  - unused_private_declaration
   - vertical_parameter_alignment
   - vertical_whitespace
   - void_return
@@ -135,7 +135,7 @@ warning_threshold: 15
 file_header:
   required_pattern: |
                     \/\/
-                    \/\/ Copyright \(C\) 2015-2020 Virgil Security Inc.
+                    \/\/ Copyright \(C\) 2015-2021 Virgil Security Inc.
                     \/\/
                     \/\/ All rights reserved.
                     \/\/

diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,23 @@
 language: objective-c
-osx_image: xcode11.4
+osx_image: xcode12.5
 
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - PROJECT=VirgilE3Kit.xcodeproj
-    - IOS_SDK=iphonesimulator13.4
-    - MACOS_SDK=macosx10.15
-    - TVOS_SDK=appletvsimulator13.4
-    - WATCHOS_SDK=watchsimulator6.2
+    - IOS_SDK=iphonesimulator14.5
+    - MACOS_SDK=macosx11.3
+    - TVOS_SDK=appletvsimulator14.5
+    - WATCHOS_SDK=watchsimulator7.4
     - FRAMEWORK_NAME=VirgilE3Kit
     - REPO=VirgilSecurity/virgil-e3kit-x
 
   matrix:
-    - DESTINATION=""                                           PREFIX=""         SDK=""              BUILD="0"  PUBLISH_CARTHAGE="YES"  CARTHAGE_PLATFORM_NAME="Mac"      PUBLISH_POD="YES" POD_LIB_LINT="NO"  PUBLISH_DOCS="YES"  SWIFT_LINT="YES"
-    - DESTINATION="OS=13.4.1,name=iPhone 8"                      PREFIX="iOS"      SDK="$IOS_SDK"      BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="iOS"      PUBLISH_POD="NO"  POD_LIB_LINT="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"  POD_LIB_LINT="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
-    - DESTINATION="OS=13.4,name=Apple TV 4K"                   PREFIX="tvOS"     SDK="$TVOS_SDK"     BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="tvOS"     PUBLISH_POD="NO"  POD_LIB_LINT="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
-    - DESTINATION="OS=6.2,name=Apple Watch Series 4 - 44mm"    PREFIX="watchOS"  SDK="$WATCHOS_SDK"  BUILD="1"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="watchOS"  PUBLISH_POD="NO"  POD_LIB_LINT="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION=""                                           PREFIX=""         SDK=""              BUILD="0"  PUBLISH_CARTHAGE="YES"  CARTHAGE_PLATFORM_NAME="Mac"      PUBLISH_POD="YES" PUBLISH_DOCS="YES"  SWIFT_LINT="YES"
+    - DESTINATION="OS=14.5,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=14.5,name=Apple TV"                      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=7.4,name=Apple Watch Series 6 - 40mm"    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:
@@ -36,7 +36,7 @@ script:
     fi
 
   - carthage version
-  - carthage bootstrap --platform ${CARTHAGE_PLATFORM_NAME}
+  - carthage bootstrap --use-xcframeworks --platform ${CARTHAGE_PLATFORM_NAME}
 
   - |
     if [ $SWIFT_LINT == "YES" ]; then
@@ -57,18 +57,9 @@ script:
       xcodebuild -verbose -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release clean build | xcpretty;
     fi
 
-  # Check pod lib
-  - if [ $POD_LIB_LINT == "YES" ]; then
-      gem install cocoapods;
-      pod repo update;
-      pod lib lint;
-    fi
-
   # Build with carthage
-  - if [ $PUBLISH_CARTHAGE == "YES" ]; then
-      brew outdated carthage || brew upgrade carthage;
-      carthage build --no-skip-current;
-      carthage archive;
+  - if [[ $PUBLISH_CARTHAGE == "YES" && $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+        ./CI/publish-carthage.sh;
     fi
 
   # Generate and publish docs
@@ -80,7 +71,7 @@ deploy:
   # Upload framework to gh-releases for carthage
   - provider: releases
     api_key: $GITHUB_ACCESS_TOKEN
-    file: $FRAMEWORK_NAME.framework.zip
+    file: $FRAMEWORK_NAME.xcframework.zip
     skip_cleanup: true
     on:
       repo: $REPO

diff --git a/CI/publish-carthage.sh b/CI/publish-carthage.sh
@@ -0,0 +1,6 @@
+brew update;
+brew outdated carthage || brew upgrade carthage;
+carthage build --use-xcframeworks --no-skip-current;
+
+# TODO: Should be replaced by carthage archive, when it supports xcframeworks
+zip -r VirgilE3Kit.xcframework.zip Carthage/Build/VirgilE3Kit.xcframework
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "VirgilSecurity/virgil-ratchet-x" ~> 0.7.0
-github "VirgilSecurity/virgil-pythia-x" ~> 0.9.1
+github "VirgilSecurity/virgil-ratchet-x" "0.8.0"
+github "VirgilSecurity/virgil-pythia-x" "0.10.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,6 @@
-github "VirgilSecurity/virgil-crypto-c" "v0.15.2"
-github "VirgilSecurity/virgil-crypto-x" "5.5.0"
-github "VirgilSecurity/virgil-cryptowrapper-x" "0.15.2"
-github "VirgilSecurity/virgil-pythia-x" "0.9.1"
-github "VirgilSecurity/virgil-ratchet-x" "0.7.0"
-github "VirgilSecurity/virgil-sdk-x" "7.2.1"
+github "VirgilSecurity/virgil-crypto-c" "v0.16.0"
+github "VirgilSecurity/virgil-crypto-x" "6.0.0"
+github "VirgilSecurity/virgil-cryptowrapper-x" "0.16.0"
+github "VirgilSecurity/virgil-pythia-x" "0.10.0"
+github "VirgilSecurity/virgil-ratchet-x" "0.8.0"
+github "VirgilSecurity/virgil-sdk-x" "8.0.0"
diff --git a/E3Kit TestApp iOS/AppDelegate.swift b/E3Kit TestApp iOS/AppDelegate.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/E3Kit TestApp iOS/ViewController.swift b/E3Kit TestApp iOS/ViewController.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/E3Kit TestApp tvOS/AppDelegate.swift b/E3Kit TestApp tvOS/AppDelegate.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/E3Kit TestApp tvOS/ViewController.swift b/E3Kit TestApp tvOS/ViewController.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020, Virgil Security, Inc.
+Copyright (c) 2015-2021, Virgil Security, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -27,3 +27,5 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Lead Maintainer: Virgil Security, Inc. <support@virgilsecurity.com>
diff --git a/Source/EThree+Utils.swift b/Source/EThree+Utils.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/EThree.swift b/Source/EThree.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Managers/GroupManager.swift b/Source/Managers/GroupManager.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Managers/LookupManager.swift b/Source/Managers/LookupManager.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Managers/TempChannelManager.swift b/Source/Managers/TempChannelManager.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/ChangedKeyDelegate.swift b/Source/Models/ChangedKeyDelegate.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/DerivedPasswords.swift b/Source/Models/DerivedPasswords.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/EThreeParams.swift b/Source/Models/EThreeParams.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/EThreeError.swift b/Source/Models/Errors/EThreeError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/EThreeParamsError.swift b/Source/Models/Errors/EThreeParamsError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/EThreeRatchetError.swift b/Source/Models/Errors/EThreeRatchetError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/FindUsersError.swift b/Source/Models/Errors/FindUsersError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/GroupError.swift b/Source/Models/Errors/GroupError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/ServiceErrorCodes.swift b/Source/Models/Errors/ServiceErrorCodes.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Errors/TemporaryChannelError.swift b/Source/Models/Errors/TemporaryChannelError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/Group/Group+Encryption.swift b/Source/Models/Mixtec/Group/Group+Encryption.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/Group/Group+Management.swift b/Source/Models/Mixtec/Group/Group+Management.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/Group/Group+Objc-C.swift b/Source/Models/Mixtec/Group/Group+Objc-C.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/Group/Group.swift b/Source/Models/Mixtec/Group/Group.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/GroupInfo.swift b/Source/Models/Mixtec/GroupInfo.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/RawGroup.swift b/Source/Models/Mixtec/RawGroup.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Mixtec/Ticket.swift b/Source/Models/Mixtec/Ticket.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Ratchet/RatchetChannel+Encryption.swift b/Source/Models/Ratchet/RatchetChannel+Encryption.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Ratchet/RatchetChannel.swift b/Source/Models/Ratchet/RatchetChannel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/Models/Unsafe/UnsafeChannel.swift b/Source/Models/Unsafe/UnsafeChannel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //

diff --git a/Source/PublicAPI/Actions/EThree+Authorization.swift b/Source/PublicAPI/Actions/EThree+Authorization.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2020 Virgil Security Inc.
+// Copyright (C) 2015-2021 Virgil Security Inc.
 //
 // All rights reserved.
 //