Skip to content

Commit c4455ea

Browse files
authored
Merge branch 'master' into MigrateToNewSQLCipher
2 parents 9bfc767 + dcbbd35 commit c4455ea

Some content is hidden

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

73 files changed

+3237
-2175
lines changed

.cocoadocs.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

.github/workflows/build.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Build and test
2+
on: [push, pull_request]
3+
env:
4+
IOS_SIMULATOR: iPhone 12
5+
IOS_VERSION: 14.4
6+
jobs:
7+
build:
8+
runs-on: macos-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Install
12+
run: |
13+
gem update bundler
14+
gem install xcpretty --no-document
15+
brew update
16+
brew outdated carthage || brew upgrade carthage
17+
brew outdated swiftlint || brew upgrade swiftlint
18+
- name: "Lint"
19+
run: make lint
20+
- name: "Run tests (PACKAGE_MANAGER_COMMAND: test)"
21+
env:
22+
PACKAGE_MANAGER_COMMAND: test -Xswiftc -warnings-as-errors
23+
run: ./run-tests.sh
24+
- name: "Run tests (BUILD_SCHEME: SQLite iOS)"
25+
env:
26+
BUILD_SCHEME: SQLite iOS
27+
run: ./run-tests.sh
28+
- name: "Run tests (BUILD_SCHEME: SQLite Mac)"
29+
env:
30+
BUILD_SCHEME: SQLite Mac
31+
run: ./run-tests.sh
32+
- name: "Run tests (VALIDATOR_SUBSPEC: none)"
33+
env:
34+
VALIDATOR_SUBSPEC: none
35+
run: ./run-tests.sh
36+
- name: "Run tests (VALIDATOR_SUBSPEC: standard)"
37+
env:
38+
VALIDATOR_SUBSPEC: standard
39+
run: ./run-tests.sh
40+
- name: "Run tests (VALIDATOR_SUBSPEC: standalone)"
41+
env:
42+
VALIDATOR_SUBSPEC: standalone
43+
run: ./run-tests.sh
44+
- name: "Run tests (VALIDATOR_SUBSPEC: SQLCipher)"
45+
env:
46+
VALIDATOR_SUBSPEC: SQLCipher
47+
run: ./run-tests.sh
48+
- name: "Run tests (CARTHAGE_PLATFORM: iOS)"
49+
env:
50+
CARTHAGE_PLATFORM: iOS
51+
run: ./run-tests.sh
52+
- name: "Run tests (CARTHAGE_PLATFORM: Mac)"
53+
env:
54+
CARTHAGE_PLATFORM: Mac
55+
run: ./run-tests.sh
56+
- name: "Run tests (CARTHAGE_PLATFORM: watchOS)"
57+
env:
58+
CARTHAGE_PLATFORM: watchOS
59+
run: ./run-tests.sh
60+
- name: "Run tests (CARTHAGE_PLATFORM: tvOS)"
61+
env:
62+
CARTHAGE_PLATFORM: tvOS
63+
run: ./run-tests.sh

.swift-version

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

.swiftlint.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
disabled_rules: # rule identifiers to exclude from running
2+
- todo
3+
- operator_whitespace
4+
- large_tuple
5+
- closure_parameter_position
6+
included: # paths to include during linting. `--path` is ignored if present. takes precendence over `excluded`.
7+
- Sources
8+
- Tests
9+
excluded: # paths to ignore during linting. overridden by `included`.
10+
11+
identifier_name:
12+
excluded:
13+
- db
14+
- in
15+
- to
16+
- by
17+
- or
18+
- eq
19+
- gt
20+
- lt
21+
- fn
22+
- a
23+
- b
24+
- q
25+
- SQLITE_TRANSIENT
26+
27+
type_body_length:
28+
warning: 260
29+
error: 260
30+
31+
function_body_length:
32+
warning: 60
33+
error: 60
34+
35+
line_length:
36+
warning: 150
37+
error: 150
38+
ignores_comments: true
39+
40+
file_length:
41+
warning: 900
42+
error: 900

.travis.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
0.11.6 (xxx), [diff][diff-0.11.6]
1+
0.13.0 (22-08-2021), [diff][diff-0.13.0]
2+
========================================
3+
4+
* Swift 5.3 support
5+
* Xcode 12.5 support
6+
* Bumps minimum deployment versions
7+
* Fixes up Package.swift to build SQLiteObjc module
8+
9+
0.12.1, 0.12.2 (21-06-2019) [diff][diff-0.12.2]
10+
========================================
11+
12+
* CocoaPods modular headers support
13+
14+
0.12.0 (24-04-2019) [diff][diff-0.12.0]
15+
========================================
16+
17+
* Version with Swift 5 Support
18+
19+
0.11.6 (19-04-2019), [diff][diff-0.11.6]
220
========================================
321

422
* Swift 4.2, SQLCipher 4.x ([#866][])
@@ -63,6 +81,9 @@
6381
[diff-0.11.4]: https://github.com/stephencelis/SQLite.swift/compare/0.11.3...0.11.4
6482
[diff-0.11.5]: https://github.com/stephencelis/SQLite.swift/compare/0.11.4...0.11.5
6583
[diff-0.11.6]: https://github.com/stephencelis/SQLite.swift/compare/0.11.5...0.11.6
84+
[diff-0.12.0]: https://github.com/stephencelis/SQLite.swift/compare/0.11.6...0.12.0
85+
[diff-0.12.2]: https://github.com/stephencelis/SQLite.swift/compare/0.12.0...0.12.2
86+
[diff-0.13.0]: https://github.com/stephencelis/SQLite.swift/compare/0.12.2...0.13.0
6687

6788
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142
6889
[#315]: https://github.com/stephencelis/SQLite.swift/issues/315

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ addresses everything. If it doesn’t, continue the conversation there.
1919
If your searches return empty, see the [bug](#bugs) or [feature
2020
request](#feature-requests) guidelines below.
2121

22-
[Ask on Stack Overflow]: http://stackoverflow.com/questions/tagged/sqlite.swift
22+
[Ask on Stack Overflow]: https://stackoverflow.com/questions/tagged/sqlite.swift
2323
[Search]: https://github.com/stephencelis/SQLite.swift/search?type=Issues
2424

2525

0 commit comments

Comments
 (0)