Skip to content

Commit 6cf2bc4

Browse files
committed
Merge branch 'hotfix-1.4.2'
2 parents e751607 + 16a4f4e commit 6cf2bc4

32 files changed

+261
-478
lines changed

.jazzy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ sourcekitten_sourcefile: docs.json
33
clean: true
44
author: Timofey Solomko
55
module: BitByteData
6-
module_version: 1.4.1
7-
copyright: '© 2019 Timofey Solomko'
6+
module_version: 1.4.2
7+
copyright: '© 2020 Timofey Solomko'
88
readme: README.md
99
github_url: https://github.com/tsolomko/BitByteData
10-
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.4.1
10+
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.4.2
1111
theme: fullwidth
1212

1313
custom_categories:

.swift-version

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

.travis.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,21 @@ jobs:
33
- stage: test
44
language: swift
55
os: osx
6-
osx_image: xcode10.2
6+
osx_image: xcode10.3
77
script:
88
- swift build
99
- swift test --filter BitByteDataTests
1010
- swift build -c release # Check Release build just in case.
11-
- language: generic
11+
- stage: test
12+
language: swift
13+
os: osx
14+
osx_image: xcode11.3
15+
script:
16+
- swift build
17+
- swift test --filter BitByteDataTests
18+
- swift build -c release # Check Release build just in case.
19+
- stage: test
20+
language: generic
1221
os: linux
1322
dist: xenial
1423
install:
@@ -21,7 +30,14 @@ jobs:
2130
if: NOT (tag IS present)
2231
language: swift
2332
os: osx
24-
osx_image: xcode10.2
33+
osx_image: xcode10.3
34+
script:
35+
- ./benchmarks.py run
36+
- stage: benchmark
37+
if: NOT (tag IS present)
38+
language: swift
39+
os: osx
40+
osx_image: xcode11.3
2541
script:
2642
- ./benchmarks.py run
2743
- stage: benchmark
@@ -37,7 +53,7 @@ jobs:
3753
if: tag IS present
3854
language: generic
3955
os: osx
40-
osx_image: xcode10.2
56+
osx_image: xcode11.3
4157
env:
4258
secure: fmKQgrPRx2iisNPzxDhOTfXPsnQMJxDgIMItVNjl1AKByraOpiDAGVESySvy+vwQqITCB/BfvdkW7smAPcvFJxIPRx1v4J0VY9kGHdnafMw35XY0Vj9soYkzNS4zrUebxY2gWkGM6Q6dgLOGT/9MSEyWqXBTtVz9sLwA7yr3ZI72yZDbcSz3XGa1fFZRVfwv3I+bmuozG7dq7tyqcSKgRZnHg1VvaRdxcaGqSGSUsNu0YLzmNedujNcU+gTXcxMdrXA1eaheHc2pwNA0TDf3KkefJpaVMXrA/Un8e9MaJ1lMnPlIiEI3dPTuogtQY7p59vgulBNBPEJovTHI0jCaNyLUkTkHgGcUuOwHqwUIKZCEiiqM1j12sdLo4O2tAdNaNHDtd8D3bCakrdJxXlUWVfjrCwvBB555gd0drRirQgYX+5gGFwnTQE8tOcjK4qUvJaOAouHsnm/DmW+fLJPX76KoU6QOtGJt6PQ92yBgKRhaSg/sQ28WPuCmF2p7BuUSuULxcM2LU5eA5aFxayoZvR2E9uvfFxnFh01iV6clcZo25U03AuxJmuI7Mhl83amj8bm5CRBbuRw5sIljXfBujFUel+kz/HXalS7lStqH9iPyiQvh24WkPzHKNQdjRI7v3kyrVSXJ3Xl6+fopXqr/25MwqD4bt57QgglJ2IQtnLM=
4359
addons:
@@ -53,8 +69,6 @@ jobs:
5369
- >
5470
if ! [ "$BEFORE_DEPLOY_RUN" ]; then
5571
export BEFORE_DEPLOY_RUN=1;
56-
# Necessary for correct SourceKitten processing.
57-
swift build
5872
# Build Carthage archive.
5973
carthage build --no-skip-current
6074
carthage archive BitByteData
@@ -64,13 +78,11 @@ jobs:
6478
fi
6579
deploy:
6680
- provider: releases
67-
skip_cleanup: true
6881
api_key: $GITHUB_TOKEN
6982
file: "BitByteData.framework.zip"
7083
on:
7184
tags: true
7285
- provider: pages
73-
skip_cleanup: true
7486
github_token: $GITHUB_TOKEN
7587
local_dir: docs
7688
on:

BitByteData.podspec

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "BitByteData"
4-
s.version = "1.4.1"
4+
s.version = "1.4.2"
55
s.summary = "Read and write bits and bytes in Swift."
66

77
s.description = "A Swift framework with classes for reading and writing bits and bytes."
@@ -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 = "4.2"
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/BitByteData.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.4.1</string>
18+
<string>1.4.2</string>
1919
<key>CFBundleVersion</key>
20-
<string>19</string>
20+
<string>21</string>
2121
<key>NSHumanReadableCopyright</key>
22-
<string>Copyright © 2019 Timofey Solomko. All rights reserved.</string>
22+
<string>Copyright © 2020 Timofey Solomko. All rights reserved.</string>
2323
</dict>
2424
</plist>

BitByteData.xcodeproj/BitByteDataBenchmarks.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.4.1</string>
18+
<string>1.4.2</string>
1919
<key>CFBundleVersion</key>
20-
<string>19</string>
20+
<string>21</string>
2121
</dict>
2222
</plist>

BitByteData.xcodeproj/TestBitByteData.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.4.1</string>
18+
<string>1.4.2</string>
1919
<key>CFBundleVersion</key>
20-
<string>19</string>
20+
<string>21</string>
2121
</dict>
2222
</plist>

BitByteData.xcodeproj/project.pbxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@
334334
);
335335
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.BitByteDataBenchmarks;
336336
PRODUCT_NAME = "$(TARGET_NAME)";
337-
SWIFT_VERSION = 4.2;
338337
};
339338
name = Debug;
340339
};
@@ -352,7 +351,6 @@
352351
);
353352
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.BitByteDataBenchmarks;
354353
PRODUCT_NAME = "$(TARGET_NAME)";
355-
SWIFT_VERSION = 4.2;
356354
};
357355
name = Release;
358356
};
@@ -378,7 +376,7 @@
378376
CLANG_WARN_SUSPICIOUS_MOVE = YES;
379377
CLANG_WARN_UNREACHABLE_CODE = YES;
380378
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
381-
CURRENT_PROJECT_VERSION = 19;
379+
CURRENT_PROJECT_VERSION = 21;
382380
DEBUG_INFORMATION_FORMAT = dwarf;
383381
ENABLE_STRICT_OBJC_MSGSEND = YES;
384382
ENABLE_TESTABILITY = YES;
@@ -393,9 +391,11 @@
393391
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
394392
MACOSX_DEPLOYMENT_TARGET = 10.10;
395393
ONLY_ACTIVE_ARCH = YES;
394+
OTHER_CODE_SIGN_FLAGS = "--deep";
396395
SDKROOT = macosx;
397396
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
398397
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
398+
SWIFT_VERSION = 5.0;
399399
TVOS_DEPLOYMENT_TARGET = 9.0;
400400
VERSIONING_SYSTEM = "apple-generic";
401401
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -424,7 +424,7 @@
424424
CLANG_WARN_SUSPICIOUS_MOVE = YES;
425425
CLANG_WARN_UNREACHABLE_CODE = YES;
426426
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
427-
CURRENT_PROJECT_VERSION = 19;
427+
CURRENT_PROJECT_VERSION = 21;
428428
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
429429
ENABLE_STRICT_OBJC_MSGSEND = YES;
430430
GCC_NO_COMMON_BLOCKS = YES;
@@ -437,9 +437,11 @@
437437
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
438438
MACOSX_DEPLOYMENT_TARGET = 10.10;
439439
ONLY_ACTIVE_ARCH = NO;
440+
OTHER_CODE_SIGN_FLAGS = "--deep";
440441
SDKROOT = macosx;
441442
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
442443
SWIFT_COMPILATION_MODE = wholemodule;
444+
SWIFT_VERSION = 5.0;
443445
TVOS_DEPLOYMENT_TARGET = 9.0;
444446
VERSIONING_SYSTEM = "apple-generic";
445447
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -452,7 +454,7 @@
452454
APPLICATION_EXTENSION_API_ONLY = YES;
453455
DEFINES_MODULE = YES;
454456
DYLIB_COMPATIBILITY_VERSION = 1;
455-
DYLIB_CURRENT_VERSION = 19;
457+
DYLIB_CURRENT_VERSION = 21;
456458
DYLIB_INSTALL_NAME_BASE = "@rpath";
457459
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
458460
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -466,7 +468,6 @@
466468
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.BitByteData;
467469
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
468470
SKIP_INSTALL = YES;
469-
SWIFT_VERSION = 4.2;
470471
VERSION_INFO_PREFIX = "";
471472
};
472473
name = Debug;
@@ -477,7 +478,7 @@
477478
APPLICATION_EXTENSION_API_ONLY = YES;
478479
DEFINES_MODULE = YES;
479480
DYLIB_COMPATIBILITY_VERSION = 1;
480-
DYLIB_CURRENT_VERSION = 19;
481+
DYLIB_CURRENT_VERSION = 21;
481482
DYLIB_INSTALL_NAME_BASE = "@rpath";
482483
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
483484
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -491,7 +492,6 @@
491492
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.BitByteData;
492493
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
493494
SKIP_INSTALL = YES;
494-
SWIFT_VERSION = 4.2;
495495
VERSION_INFO_PREFIX = "";
496496
};
497497
name = Release;
@@ -510,7 +510,6 @@
510510
);
511511
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.TestBitByteData;
512512
PRODUCT_NAME = "$(TARGET_NAME)";
513-
SWIFT_VERSION = 4.2;
514513
};
515514
name = Debug;
516515
};
@@ -528,7 +527,6 @@
528527
);
529528
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.TestBitByteData;
530529
PRODUCT_NAME = "$(TARGET_NAME)";
531-
SWIFT_VERSION = 4.2;
532530
};
533531
name = Release;
534532
};

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Timofey Solomko
3+
Copyright (c) 2020 Timofey Solomko
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let package = Package(
@@ -13,5 +13,5 @@ let package = Package(
1313
.testTarget(name: "BitByteDataTests", dependencies: ["BitByteData"]),
1414
.testTarget(name: "BitByteDataBenchmarks", dependencies: ["BitByteData"])
1515
],
16-
swiftLanguageVersions: [4]
16+
swiftLanguageVersions: [.v5]
1717
)

0 commit comments

Comments
 (0)