Skip to content

Commit

Permalink
Merge pull request #18 from VirgilSecurity/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
SanjoDeundiak authored Apr 17, 2020
2 parents d0b6811 + 8e58207 commit 0959e8e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
language: objective-c
osx_image: xcode11.3
osx_image: xcode11.4

env:
global:
- LC_CTYPE=en_US.UTF-8
- PROJECT=VirgilSDKPythia.xcodeproj
- IOS_SDK=iphonesimulator13.2
- IOS_SDK=iphonesimulator13.4
- MACOS_SDK=macosx10.15
- TVOS_SDK=appletvsimulator13.2
- WATCHOS_SDK=watchsimulator6.1
- TVOS_SDK=appletvsimulator13.4
- WATCHOS_SDK=watchsimulator6.2
- FRAMEWORK_NAME=VirgilSDKPythia
- REPO=VirgilSecurity/virgil-pythia-x

matrix:
- DESTINATION="" PREFIX="" SDK="" BUILD="0" PUBLISH_CARTHAGE="YES" CARTHAGE_PLATFORM_NAME="Mac" PUBLISH_POD="YES" PUBLISH_DOCS="YES" SWIFT_LINT="YES"
- DESTINATION="OS=13.3,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.4,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.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.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"
- 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" 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" PUBLISH_DOCS="NO" SWIFT_LINT="NO"

before_install:
- set -e
Expand Down
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "VirgilSecurity/virgil-crypto-c" "v0.12.0"
github "VirgilSecurity/virgil-crypto-x" "5.3.0"
github "VirgilSecurity/virgil-cryptowrapper-x" "0.12.0"
github "VirgilSecurity/virgil-sdk-x" "7.1.0"
github "VirgilSecurity/virgil-crypto-c" "v0.14.0"
github "VirgilSecurity/virgil-crypto-x" "5.4.0"
github "VirgilSecurity/virgil-cryptowrapper-x" "0.14.0"
github "VirgilSecurity/virgil-sdk-x" "7.2.0"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To integrate Virgil Pythia into your Xcode project using CocoaPods, specify it i
target '<Your Target Name>' do
use_frameworks!

pod 'VirgilSDKPythia', '~> 0.8.0'
pod 'VirgilSDKPythia', '~> 0.9.0'
end
```

Expand All @@ -67,7 +67,7 @@ $ brew install carthage
To integrate Virgil Pythia into your Xcode project using Carthage, create an empty file with name *Cartfile* in your project's root folder and add following lines to your *Cartfile*

```
github "VirgilSecurity/virgil-pythia-x" ~> 0.8.0
github "VirgilSecurity/virgil-pythia-x" ~> 0.9.0
```

#### Linking against prebuilt binaries
Expand Down
4 changes: 2 additions & 2 deletions VirgilSDKPythia.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "VirgilSDKPythia"
s.version = "0.8.0"
s.version = "0.9.0"
s.swift_version = "5.0"
s.license = { :type => "BSD", :file => "LICENSE" }
s.summary = "Virgil Pythia SDK for Apple devices and languages."
Expand All @@ -13,5 +13,5 @@ Pod::Spec.new do |s|
s.watchos.deployment_target = "2.0"
s.source_files = 'Source/**/*.{swift}'
s.dependency "VirgilSDK", "~> 7.1"
s.dependency "VirgilCryptoPythia", "~> 0.12.0"
s.dependency "VirgilCryptoPythia", "~> 0.14.0"
end
2 changes: 1 addition & 1 deletion VirgilSDKPythia/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.8.0</string>
<string>0.9.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

0 comments on commit 0959e8e

Please # to comment.