Skip to content

Commit 0790df0

Browse files
committed
Several deployment-related changes
Remove .swift-version file (it's deprecated by Cocoapods), run deploy phase in CI using xcode 11.3, remove extra swift build in CI deploy phase (sourcekitten now runs it itself), remove deprecated skip_cleanup setting from CI config, remove test spec from podspec (since watchos doesn't have XCTest, we have to use --skip-tests flag with cocoapods anyway), adjusted swift_versions setting in podspec, add --deep flag to xcode signing to prevent some weird potential issues with xcode 11.
1 parent 03a2f5c commit 0790df0

4 files changed

Lines changed: 4 additions & 11 deletions

File tree

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
if: tag IS present
5454
language: generic
5555
os: osx
56-
osx_image: xcode10.3
56+
osx_image: xcode11.3
5757
env:
5858
secure: fmKQgrPRx2iisNPzxDhOTfXPsnQMJxDgIMItVNjl1AKByraOpiDAGVESySvy+vwQqITCB/BfvdkW7smAPcvFJxIPRx1v4J0VY9kGHdnafMw35XY0Vj9soYkzNS4zrUebxY2gWkGM6Q6dgLOGT/9MSEyWqXBTtVz9sLwA7yr3ZI72yZDbcSz3XGa1fFZRVfwv3I+bmuozG7dq7tyqcSKgRZnHg1VvaRdxcaGqSGSUsNu0YLzmNedujNcU+gTXcxMdrXA1eaheHc2pwNA0TDf3KkefJpaVMXrA/Un8e9MaJ1lMnPlIiEI3dPTuogtQY7p59vgulBNBPEJovTHI0jCaNyLUkTkHgGcUuOwHqwUIKZCEiiqM1j12sdLo4O2tAdNaNHDtd8D3bCakrdJxXlUWVfjrCwvBB555gd0drRirQgYX+5gGFwnTQE8tOcjK4qUvJaOAouHsnm/DmW+fLJPX76KoU6QOtGJt6PQ92yBgKRhaSg/sQ28WPuCmF2p7BuUSuULxcM2LU5eA5aFxayoZvR2E9uvfFxnFh01iV6clcZo25U03AuxJmuI7Mhl83amj8bm5CRBbuRw5sIljXfBujFUel+kz/HXalS7lStqH9iPyiQvh24WkPzHKNQdjRI7v3kyrVSXJ3Xl6+fopXqr/25MwqD4bt57QgglJ2IQtnLM=
5959
addons:
@@ -69,8 +69,6 @@ jobs:
6969
- >
7070
if ! [ "$BEFORE_DEPLOY_RUN" ]; then
7171
export BEFORE_DEPLOY_RUN=1;
72-
# Necessary for correct SourceKitten processing.
73-
swift build
7472
# Build Carthage archive.
7573
carthage build --no-skip-current
7674
carthage archive BitByteData
@@ -80,13 +78,11 @@ jobs:
8078
fi
8179
deploy:
8280
- provider: releases
83-
skip_cleanup: true
8481
api_key: $GITHUB_TOKEN
8582
file: "BitByteData.framework.zip"
8683
on:
8784
tags: true
8885
- provider: pages
89-
skip_cleanup: true
9086
github_token: $GITHUB_TOKEN
9187
local_dir: docs
9288
on:

BitByteData.podspec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ Pod::Spec.new do |s|
2020
s.tvos.deployment_target = "9.0"
2121
s.watchos.deployment_target = "2.0"
2222

23-
s.swift_version = "5.0"
23+
s.swift_versions = ["4", "5"]
2424

2525
s.source_files = "Sources/*.swift"
2626

27-
s.test_spec "Tests" do |test_spec|
28-
test_spec.source_files = "Tests/BitByteDataTests/*.swift"
29-
end
30-
3127
end

BitByteData.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@
391391
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
392392
MACOSX_DEPLOYMENT_TARGET = 10.10;
393393
ONLY_ACTIVE_ARCH = YES;
394+
OTHER_CODE_SIGN_FLAGS = "--deep";
394395
SDKROOT = macosx;
395396
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
396397
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -436,6 +437,7 @@
436437
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
437438
MACOSX_DEPLOYMENT_TARGET = 10.10;
438439
ONLY_ACTIVE_ARCH = NO;
440+
OTHER_CODE_SIGN_FLAGS = "--deep";
439441
SDKROOT = macosx;
440442
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
441443
SWIFT_COMPILATION_MODE = wholemodule;

0 commit comments

Comments
 (0)