Skip to content

Commit 5e40077

Browse files
authored
Merge pull request #143 from brightdigit/release/3.0.0
Release/3.0.0
2 parents 4310c46 + 078ad0d commit 5e40077

File tree

2,744 files changed

+15203
-8475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,744 files changed

+15203
-8475
lines changed

.github/workflows/macOS.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: macOS
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
env:
8+
PACKAGE_NAME: Speculid
9+
10+
runs-on: macos-latest
11+
if: "!contains(github.event.head_commit.message, 'ci skip')"
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Prepare Build
16+
run: brew bundle
17+
#- name: Build
18+
# run: swift build
19+
- name: Lint
20+
run: swiftformat --lint . && swiftlint
21+
#- name: Run tests
22+
# run: swift test -v --enable-code-coverage
23+
#- name: Prepare Code Coverage
24+
# run: xcrun llvm-cov export -format="lcov" .build/debug/${{ env.PACKAGE_NAME }}PackageTests.xctest/Contents/MacOS/${{ env.PACKAGE_NAME }}PackageTests -instr-profile .build/debug/codecov/default.profdata > info.lcov
25+
#- name: Upload to CodeCov.io
26+
# run: bash <(curl https://codecov.io/bash) -F github -F macOS -n ${{ github.sha }}
27+
# env:
28+
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
29+
#- name: Build Documentation
30+
# run: sourcedocs generate --spm-module ${{ env.PACKAGE_NAME }}
31+
#- name: Verify Valid Swift Package
32+
# run: swift package dump-package | jq -e ".products | length > 0"
33+
#- name: CocoaPods Action
34+
# run: pod lib lint
35+
36+
#- name: Commit files
37+
# run: |
38+
# git config --local user.email "action@github.com"
39+
# git config --local user.name "GitHub Action"
40+
# git status
41+
# git add Documentation
42+
# git diff-index --quiet HEAD || git commit -m "[github action] Update Docs"
43+
# git push

.gitignore

Lines changed: 27 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

2-
# Created by https://www.gitignore.io/api/macos,swift,xcode,objective-c,jekyll
3-
4-
### Jekyll ###
2+
# Created by https://www.gitignore.io/api/xcode,macos,swift
3+
# Edit at https://www.gitignore.io/?templates=xcode,macos,swift
54
_site/
65
.sass-cache/
76
.jekyll-cache/
@@ -35,7 +34,7 @@ Network Trash Folder
3534
Temporary Items
3635
.apdisk
3736

38-
### Objective-C ###
37+
### Swift ###
3938
# Xcode
4039
#
4140
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
@@ -66,26 +65,34 @@ xcuserdata/
6665
*.dSYM.zip
6766
*.dSYM
6867

68+
## Playgrounds
69+
timeline.xctimeline
70+
playground.xcworkspace
71+
72+
# Swift Package Manager
73+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
74+
# Packages/
75+
# Package.pins
76+
# Package.resolved
77+
.build/
78+
# Add this line if you want to avoid checking in Xcode SPM integration.
79+
# .swiftpm/xcode
80+
6981
# CocoaPods
70-
#
7182
# We recommend against adding the Pods directory to your .gitignore. However
7283
# you should judge for yourself, the pros and cons are mentioned at:
7384
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
74-
#
7585
# Pods/
76-
#
7786
# Add this line if you want to avoid checking in source code from the Xcode workspace
7887
# *.xcworkspace
7988

8089
# Carthage
81-
#
8290
# Add this line if you want to avoid checking in source code from Carthage dependencies.
8391
# Carthage/Checkouts
8492

8593
Carthage/Build
8694

8795
# fastlane
88-
#
8996
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
9097
# screenshots whenever they are needed.
9198
# For more information about the recommended setup visit:
@@ -97,67 +104,13 @@ fastlane/screenshots/**/*.png
97104
fastlane/test_output
98105

99106
# Code Injection
100-
#
101107
# After new code Injection tools there's a generated folder /iOSInjectionProject
102108
# https://github.com/johnno1962/injectionforxcode
103109

104110
iOSInjectionProject/
105111

106-
### Objective-C Patch ###
107-
108-
### Swift ###
109-
# Xcode
110-
#
111-
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
112-
113-
## Build generated
114-
115-
## Various settings
116-
117-
## Other
118-
119-
## Obj-C/Swift specific
120-
121-
## Playgrounds
122-
timeline.xctimeline
123-
playground.xcworkspace
124-
125-
# Swift Package Manager
126-
#
127-
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
128-
# Packages/
129-
# Package.pins
130-
# Package.resolved
131-
.build/
132-
133-
# CocoaPods
134-
#
135-
# We recommend against adding the Pods directory to your .gitignore. However
136-
# you should judge for yourself, the pros and cons are mentioned at:
137-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
138-
#
139-
Pods/
140-
#
141-
# Add this line if you want to avoid checking in source code from the Xcode workspace
142-
# *.xcworkspace
143-
144-
# Carthage
145-
#
146-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
147-
# Carthage/Checkouts
148-
149-
150-
# fastlane
151-
#
152-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
153-
# screenshots whenever they are needed.
154-
# For more information about the recommended setup visit:
155-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
156-
157-
158112
### Xcode ###
159113
# Xcode
160-
#
161114
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
162115

163116
## User settings
@@ -166,7 +119,7 @@ Pods/
166119

167120
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
168121

169-
### Xcode Patch ###
122+
## Xcode Patch
170123
*.xcodeproj/*
171124
!*.xcodeproj/project.pbxproj
172125
!*.xcodeproj/xcshareddata/
@@ -191,16 +144,17 @@ certs/*.p12
191144
*.toc.*
192145
*.orig.*
193146

194-
examples/**/*.xcassets/**/*.png
195-
examples/**/*.xcassets/**/*.pdf
147+
examples/*/*.xcassets/*/*.png
148+
examples/*/*.xcassets/*/*.pdf
149+
150+
### Xcode Patch ###
151+
**/xcshareddata/WorkspaceSettings.xcsettings
196152

197-
#examples/sample/**/*.xcassets/***/*.png
198-
#examples/sample/**/*.xcassets/*/*.pdf
153+
# End of https://www.gitignore.io/api/xcode,macos,swift
199154

200-
playgrounds
201155

202-
.version
203-
*.coverage.txt
204-
**/fastlane/report.xml
156+
!scripts/github-markdown-toc
205157

206-
examples/samples
158+
**/*.xcassets/**/*.png
159+
**/*.xcassets/**/*.pdf
160+
**/*.xcassets/**/*.svg

.gitmodules

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[submodule "scripts/github-markdown-toc"]
22
path = scripts/github-markdown-toc
33
url = https://github.com/ekalinin/github-markdown-toc.git
4-
[submodule "packages/homebrew"]
5-
path = packages/homebrew
6-
url = https://github.com/brightdigit/homebrew-speculid.git
7-
[submodule "packages/fastlane"]
8-
path = packages/fastlane
9-
url = https://github.com/brightdigit/fastlane-plugin-speculid.git
4+
[submodule "packages/SpeculidKit"]
5+
path = packages/SpeculidKit
6+
url = https://github.com/brightdigit/SpeculidKit.git
7+
branch = release/3.0.0-alpha.2

.hound.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
swiftlint:
2+
config_file: .swiftlint.yml

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1
1+
5

.swiftformat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--indent 2
2+
--header strip
3+
--commas inline
4+
--exclude _archive, DerivedData, packages

.swiftlint.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
excluded: # paths to ignore during linting. Takes precedence over `included`.
2-
- Pods
3-
- __archive
4-
- frameworks/speculid/Models/VCS.swift
1+
cyclomatic_complexity: 12
2+
file_length: 550
3+
function_body_length: 80
4+
function_parameter_count: 8
5+
line_length: 150
6+
type_body_length: 300
7+
identifier_name:
8+
excluded: # excluded via string array
9+
- id
10+
excluded:
11+
- Tests/*/XCTestManifests.swift
512
- DerivedData
6-
- examples/setup/DerivedData
13+
- .build
14+
- _archive
15+
- vendor
16+
- packages

.travis.yml

100644100755
Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1-
language: objective-c
2-
env:
3-
global:
4-
- secure: hVl7EFbdJhUsIzMXOZ0BESzmcMwro5fSHoFD33xCoWF+4Ov5TtiW5iy02Z4096fbgziD5SBdNG/4y87Z0kqRPPJgcGOObfwE3VWkIYj6dIHaXXnGlmieTEMRkq4a4GOjXJFpJODkKPmMSL1NLqdxUYFmn3rvCyBEQjiRQzygTj4=
5-
branches:
6-
except:
7-
- develop
8-
- release/v2.0.0-beta.1
9-
git:
10-
quiet: true
11-
osx_image: xcode11
12-
xcode_workspace: Speculid.xcworkspace
13-
xcode_scheme: Speculid-Mac-App
14-
xcode_destination: platform=macOS
15-
install:
16-
- bundle install
17-
- pod repo update --silent
18-
- pod install --silent
1+
os: osx
2+
osx_image: xcode12.2
3+
before_install:
4+
- bash -e ./Scripts/before_install.sh
195
script:
20-
- ./scripts/decrypt-certs.sh
21-
- ./scripts/build-keychain.sh
22-
- xcodebuild test -enableCodeCoverage YES -quiet -workspace speculid.xcworkspace -scheme "Speculid-Mac-App"
23-
- xcodebuild archive -quiet -workspace speculid.xcworkspace -scheme "Speculid-Mac-App" -configuration Release -derivedDataPath ./build -archivePath ./build/Products/Speculid.xcarchive
24-
- xcodebuild -quiet -exportArchive -archivePath ./build/Products/Speculid.xcarchive -exportOptionsPlist ./exportOptions.plist -exportPath ./build/Products/App
25-
- ditto -c -k --sequesterRsrc --keepParent ./build/Products/App/Speculid.app build/Speculid.zip
26-
- open Build/Products/App/Speculid.app
27-
- osascript -e 'tell application "Speculid" to quit'
28-
- diff examples/shasum <(./scripts/shasum.sh)
29-
- ./build/Products/App/Speculid.app/Contents/SharedSupport/speculid --version --useLocation ./build/Products/App/Speculid.app
30-
after_success:
31-
- bash <(curl -s https://codecov.io/bash) -J "Speculid"
32-
after_failure:
33-
- "./scripts/shasum.sh"
34-
- find "examples/Assets/." -type f \( -iname \*.icns -o -iname \*.png -o -iname \*.pdf
35-
\) -print0 | sort -z | xargs -0 shasum -a 512
36-
notifications:
37-
webhooks:
38-
urls:
39-
- https://webhooks.gitter.im/e/f596466e5c30701b566d
40-
on_success: change
41-
on_failure: always
42-
on_start: never
6+
- bash -e ./Scripts/script.sh

Brewfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
brew "swiftformat"
2+
brew "swiftlint"
3+
brew "sourcedocs"
4+
brew "carthage"
5+
brew "jq"

Documentation/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
# Reference Documentation
3+
This reference documentation was generated with
4+
[SourceDocs](https://github.com/eneko/SourceDocs).

0 commit comments

Comments
 (0)