Skip to content

Commit a481ccd

Browse files
tsolomkotsolomko
committed
Merge branch 'release-1.0.0' into develop
2 parents 9c1e408 + 94c55ce commit a481ccd

25 files changed

Lines changed: 660 additions & 65 deletions

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ fastlane/Preview.html
6666
fastlane/screenshots
6767
fastlane/test_output
6868

69-
# Ignore Xcode project generated by Swift Package Manager
70-
/BitByteData.xcodeproj
71-
7269
# Ignore docs generated by SourceKitten
7370
docs.json
7471

‎.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.0.0-dev
7-
copyright: '© 2017 Timofey Solomko'
6+
module_version: 1.0.0
7+
copyright: '© 2018 Timofey Solomko'
88
readme: README.md
99
github_url: https://github.com/tsolomko/BitByteData
10-
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/develop
10+
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.0.0
1111
theme: fullwidth
1212

1313
custom_categories:

‎.travis.yml‎

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,57 @@
1-
matrix:
2-
include:
3-
- language: objective-c
1+
jobs:
2+
include:
3+
- stage: test
4+
language: objective-c
45
osx_image: xcode9.2
5-
before_deploy:
6-
- sourcekitten doc --spm-module BitByteData > docs.json
7-
- jazzy
8-
- swift package generate-xcodeproj
9-
- carthage build --no-skip-current
10-
- carthage archive BitByteData
116
script:
127
- swift build
138
- swift test
14-
- swift build -c release # Check building in release configuration just in case.
9+
- swift build -c release # Check Release build just in case.
10+
- language: generic
11+
os: linux
12+
dist: trusty
13+
install:
14+
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
15+
script:
16+
- swift build
17+
- swift test
18+
- swift build -c release # Check Release build just in case.
19+
- stage: deploy
20+
if: tag IS present
21+
language: objective-c
22+
osx_image: xcode9.2
23+
env:
24+
secure: fmKQgrPRx2iisNPzxDhOTfXPsnQMJxDgIMItVNjl1AKByraOpiDAGVESySvy+vwQqITCB/BfvdkW7smAPcvFJxIPRx1v4J0VY9kGHdnafMw35XY0Vj9soYkzNS4zrUebxY2gWkGM6Q6dgLOGT/9MSEyWqXBTtVz9sLwA7yr3ZI72yZDbcSz3XGa1fFZRVfwv3I+bmuozG7dq7tyqcSKgRZnHg1VvaRdxcaGqSGSUsNu0YLzmNedujNcU+gTXcxMdrXA1eaheHc2pwNA0TDf3KkefJpaVMXrA/Un8e9MaJ1lMnPlIiEI3dPTuogtQY7p59vgulBNBPEJovTHI0jCaNyLUkTkHgGcUuOwHqwUIKZCEiiqM1j12sdLo4O2tAdNaNHDtd8D3bCakrdJxXlUWVfjrCwvBB555gd0drRirQgYX+5gGFwnTQE8tOcjK4qUvJaOAouHsnm/DmW+fLJPX76KoU6QOtGJt6PQ92yBgKRhaSg/sQ28WPuCmF2p7BuUSuULxcM2LU5eA5aFxayoZvR2E9uvfFxnFh01iV6clcZo25U03AuxJmuI7Mhl83amj8bm5CRBbuRw5sIljXfBujFUel+kz/HXalS7lStqH9iPyiQvh24WkPzHKNQdjRI7v3kyrVSXJ3Xl6+fopXqr/25MwqD4bt57QgglJ2IQtnLM=
25+
before_install:
26+
- brew update
27+
install:
28+
# Update Carthage.
29+
# `brew outdated` is necessary to prevent build error when there is no updates for Carthage.
30+
- brew outdated carthage || brew upgrade carthage
31+
# Install SourceKitten and Jazzy.
32+
- brew install sourcekitten
33+
- gem install -N jazzy
34+
before_deploy:
35+
# Necessary for correct SourceKitten processing.
36+
- swift build
37+
# Build Carthage archive.
38+
- carthage build --no-skip-current
39+
- carthage archive BitByteData
40+
# Generate documentation.
41+
- sourcekitten doc --spm-module BitByteData > docs.json
42+
- jazzy
1543
deploy:
1644
- provider: releases
1745
skip_cleanup: true
18-
api_key:
19-
secure: lhJi7BsAuhGo9T4rgD/UWlVRnfrO5xLIF3BUuPHb21045tEXk/BGEHgc9a9CTFm2/iR3SmP/GDsmqfJlMzWLvuTlyV5i8otIodwIp5NYstFhyA2JaEVglmnzlkf/2FkNb5KKJDyGM1KuecYmPRTUUzYThVXl59GZ2esgfiCN26pDeDgwRyJt34jeUj0VzK9JDmEJ/ODG/hvuUWyZp0zni+m6WTPZ7dILeazFEc81WATBfMo5oa8ZBChSM6lDKaW8XyKZWrMXjsK6dKfQTcVwnvrplfw2TqfPVA+YfePcq1os5Do5CELnhrUZMSI6qvOmPauzGStjsAVFTiMaYO6HdHO03mn5L9SUuyhhKqHmh2pAkM1zKxbtfKbk6oi4zJJgvbTjIO4K2X5SUwHFgjULijW9JJeCFjsLfwODvFNFHeLeql3jaKNo6kRn2VvT/uNuT3aZa+r+WeFL0HgD6Z/EEkQW5yI6DocjetRP6y9B0rpA+YyALbd0SkVIqvoywztSfxWwp7eKhQHbG/FTIfWlmMbtLq5xULQb6TyjVHO94iSfsDV2rjAeDJY73P+rPsvej4Y9LFS8VOHcsrFhFlbR9E0NjCO2CH2TZcjXPOdLu4gfapPdiqQIdgWjC6ECUwsq+Ux6jJ6QIrGC2TI/Fw58mtLf1G8SdqBRXo+Kw0IAB4g=
46+
api_key: $GITHUB_TOKEN
2047
file: "BitByteData.framework.zip"
2148
on:
2249
tags: true
2350
- provider: pages
2451
skip_cleanup: true
25-
github_token:
26-
secure: AyKeaGgdr+B0uwM4qMqi7ywFaDFlCubjBoPdLUEU681SYlhyJPhF5UiAC4DWxE4UrjWYPB4+XcRiZC+dxogQBSuAu8NwlIXHbJML+cjC+6SOS3AmJuo6Yh4nNvqsOMl8mH1PxH+vgO5zHB0OSKFgytpThN4pgzOmBMPaBBnpO7doPWzKWuOxqtjH+5X0lg40fy6e84bo6+6t7r7S6cjD5NUQe5YR+Zz3/69rb43+TnDWeYl2tCCkw+HzhqDiBWxzu1Fyu6XL8/lqXO07Np1uN9ZzlhZEns+uMrqJGMif6lqVRfHP0hdfkNQFYsSB/pJzmqSA2Tp5obfCRqHm/bOpDVVCQK/sgz6u8OKdDgAO0P5jmiRJLiKqC1+0NA1BRAsV5ZtgdemV8RLLy78MHvkJrlcTMCCPic3Udl36c0n9MVEgtae5IrbISFPF1eaVaX2h3ihAmjPHKOOXCMFL5XMmLR5Zarevn8yTDjXJ1J0+Ae3UoCIOvLBnNCz0Bu7zFG+a6zk+1or1Dul3nxvGd62WgpQn/59llKQbyCPrq+VAPXLnYKgbpAmnRwbFgXiJHaAhEIAhql2YlLgrU7rcAMmdkUREopXlE/lPzlc8lPG1YKNOPrgHO0HdGBQL50Aep39kpl2cgyBhGQFWPjmPeoCV2m0ZjOZuhtKsqFh4ovktdYc=
52+
github_token: $GITHUB_TOKEN
2753
local_dir: docs
2854
on:
2955
tags: true
30-
# Uncomment to not upload documentation if it is a test release.
31-
# condition: $(git describe) != *"test"*
32-
- language: generic
33-
os: linux
34-
sudo: required
35-
dist: trusty
36-
install:
37-
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
38-
script:
39-
- swift build
40-
- swift test
41-
- swift build -c release # Check building in release configuration just in case.
42-
notifications:
43-
email: false
56+
# Don't upload documentation if it is a test release.
57+
condition: $(git describe) != *"test"*

‎BitByteData.podspec‎

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

33
s.name = "BitByteData"
4-
s.version = "1.0.0-dev"
5-
s.summary = "Read and write bits and bytes from data consequently in Swift."
4+
s.version = "1.0.0"
5+
s.summary = "Read and write bits and bytes in Swift."
66

7-
s.description = "A Swift framework with functions for reading and writing bytes and bits."
7+
s.description = "A Swift framework with classes for reading and writing bits and bytes."
88

99
s.homepage = "https://github.com/tsolomko/BitByteData"
1010
s.documentation_url = "http://tsolomko.github.io/BitByteData"
@@ -13,14 +13,14 @@ Pod::Spec.new do |s|
1313

1414
s.author = { "Timofey Solomko" => "tsolomko@gmail.com" }
1515

16+
s.source = { :git => "https://github.com/tsolomko/BitByteData.git", :tag => "#{s.version}" }
17+
1618
s.ios.deployment_target = "8.0"
1719
s.osx.deployment_target = "10.10"
1820
s.tvos.deployment_target = "9.0"
1921
s.watchos.deployment_target = "2.0"
2022

21-
s.source = { :git => "https://github.com/tsolomko/BitByteData.git", :tag => "#{s.version}" }
22-
23-
s.source_files = 'Sources/*.swift'
23+
s.source_files = "Sources/*.swift"
2424

2525
s.test_spec 'Tests' do |test_spec|
2626
test_spec.source_files = 'Tests/BitByteDataTests/*.swift'

‎BitByteData.xcodeproj/BitByteData.plist‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>4</string>
21+
<key>NSHumanReadableCopyright</key>
22+
<string>Copyright © 2018 Timofey Solomko. All rights reserved.</string>
23+
</dict>
24+
</plist>

‎BitByteData.xcodeproj/TestBitByteData.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>4</string>
21+
</dict>
22+
</plist>

0 commit comments

Comments
 (0)