Skip to content

Commit 12b15ba

Browse files
committed
Merge branch 'master' into cossacklabs
Sync our branch with upstream updates. The updates add Apple Silicon support (with hardware acceleration), XCFrameworks, and other updates. The following commits on our branch are now obsolete: - 4e7bf92 Note that due to the changes our Makefile build system is currently broken. The following commits will fix this. This one only gets the merge correctly.
2 parents 8ba2cea + ab1ecbe commit 12b15ba

33 files changed

+1349
-493
lines changed

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
bin
44
src
55
lib
6+
frameworks
67
include/openssl
78
*.gz
89
*.framework
10+
*.o
11+
*.pbxuser
12+
*.xcworkspace/xcuserdata
13+
*.xcworkspace/xcshareddata
14+
*.xcodeproj/project.xcworkspace
15+
*.xcodeproj/xcuserdata
16+
Pods
917

1018
# Cossack Labs packaging
1119
output

.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
language: objective-c
2+
osx_image: xcode12.2
3+
xcode_workspace: Demo.xcworkspace
4+
xcode_scheme: Demo
5+
xcode_destination: platform=iOS Simulator,OS=14.2,name=iPhone 11 Pro Max
6+
cache:
7+
- bundler
8+
- cocoapods
9+
branches:
10+
only:
11+
- master
12+
install:
13+
- bundle install --jobs=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
14+
- bundle exec pod repo update
15+
- travis_wait 40 bundle exec pod install

0 commit comments

Comments
 (0)