Skip to content

Commit b0d1be3

Browse files
committed
Merge branch 'release-2.0'
2 parents fdba310 + ea2da84 commit b0d1be3

43 files changed

Lines changed: 470 additions & 2436 deletions

Some content is hidden

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

.gitignore

Lines changed: 3 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,3 @@
1-
# Xcode
2-
#
3-
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
4-
5-
## Build generated
6-
build/
7-
DerivedData/
8-
9-
## Various settings
10-
*.pbxuser
11-
!default.pbxuser
12-
*.mode1v3
13-
!default.mode1v3
14-
*.mode2v3
15-
!default.mode2v3
16-
*.perspectivev3
17-
!default.perspectivev3
18-
xcuserdata/
19-
20-
## Other
21-
*.moved-aside
22-
*.xccheckout
23-
*.xcscmblueprint
24-
25-
## Obj-C/Swift specific
26-
*.hmap
27-
*.ipa
28-
*.dSYM.zip
29-
*.dSYM
30-
31-
## Playgrounds
32-
timeline.xctimeline
33-
playground.xcworkspace
34-
35-
# Swift Package Manager
36-
#
37-
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
38-
# Packages/
39-
# Package.pins
40-
# Package.resolved
41-
.build/
42-
43-
# CocoaPods
44-
#
45-
# We recommend against adding the Pods directory to your .gitignore. However
46-
# you should judge for yourself, the pros and cons are mentioned at:
47-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
48-
#
49-
# Pods/
50-
#
51-
# Add this line if you want to avoid checking in source code from the Xcode workspace
52-
# *.xcworkspace
53-
54-
# Carthage
55-
#
56-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
57-
# Carthage/Checkouts
58-
59-
Carthage/Build
60-
61-
# fastlane
62-
#
63-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
64-
# screenshots whenever they are needed.
65-
# For more information about the recommended setup visit:
66-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
67-
68-
fastlane/report.xml
69-
fastlane/Preview.html
70-
fastlane/screenshots/**/*.png
71-
fastlane/test_output
72-
73-
# Code Injection
74-
#
75-
# After new code Injection tools there's a generated folder /iOSInjectionProject
76-
# https://github.com/johnno1962/injectionforxcode
77-
78-
iOSInjectionProject/
1+
/Restructure.xcodeproj
2+
/.build
3+
xcuserdata

Restructure.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
22

33
os: osx
4-
osx_image: xcode10.2
4+
osx_image: xcode11
55

66
xcode_project: Restructure.xcodeproj
77

@@ -11,24 +11,24 @@ xcode_scheme:
1111
- Restructure tvOS
1212

1313
xcode_sdk:
14-
- iphonesimulator12.2
15-
- macosx10.14
16-
- appletvsimulator12.2
14+
- iphonesimulator13.0
15+
- macosx10.15
16+
- appletvsimulator13.0
1717

1818
matrix:
1919
exclude:
2020
- xcode_scheme: Restructure iOS
21-
xcode_sdk: macosx10.14
21+
xcode_sdk: macosx10.15
2222
- xcode_scheme: Restructure iOS
23-
xcode_sdk: appletvsimulator12.2
23+
xcode_sdk: appletvsimulator13.0
2424
- xcode_scheme: Restructure macOS
25-
xcode_sdk: iphonesimulator12.2
25+
xcode_sdk: iphonesimulator13.0
2626
- xcode_scheme: Restructure macOS
27-
xcode_sdk: appletvsimulator12.2
27+
xcode_sdk: appletvsimulator13.0
2828
- xcode_scheme: Restructure tvOS
29-
xcode_sdk: iphonesimulator12.2
29+
xcode_sdk: iphonesimulator13.0
3030
- xcode_scheme: Restructure tvOS
31-
xcode_sdk: macosx10.14
31+
xcode_sdk: macosx10.15
3232

3333
script:
34-
- xcodebuild clean build -sdk "${TRAVIS_XCODE_SDK}" -project "${TRAVIS_XCODE_PROJECT}" -scheme "${TRAVIS_XCODE_SCHEME}" CODE_SIGNING_REQUIRED=NO
34+
- swift test

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 2.0.0 - 2019-09-12
9+
### Added
10+
- `AutoVacuum` dictates the automatic vacuuming mode.
11+
- `JournalMode` dictates the journaling mode used by the database.
12+
- `SecureDelete` dictates the data deletion mode.
13+
- `incrementalVacuum` can be used with `AutoVacuum.incremental` to affect vacuuming.
14+
- `vacuum` causes a full database vacuum to occur.
15+
16+
### Changed
17+
- Restructure is now a SwiftPM project. All legacy build tools have been removed.
18+
- The `Restructure` constructor takes a defaulted parameter for a journal mode.
19+
820
## 1.0.0 - 2019-06-20
921
### Added
1022
- Created the primary `Restructure` object for maintaining SQLite databases.

Package.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// swift-tools-version:5.1
2+
import PackageDescription
3+
4+
let package = Package(
5+
name: "Restructure",
6+
platforms: [
7+
.macOS(.v10_14), .iOS(.v12), .tvOS(.v12), .watchOS(.v5)
8+
],
9+
products: [
10+
.library(
11+
name: "Restructure",
12+
targets: ["Restructure"]
13+
),
14+
],
15+
targets: [
16+
.target(name: "Restructure"),
17+
.testTarget(
18+
name: "RestructureTests",
19+
dependencies: ["Restructure"]
20+
),
21+
]
22+
)

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
# Restructure
22

3-
[![Build Status](https://travis-ci.org/stack/Restructure.svg?branch=develop)](https://travis-ci.org/stack/Restructure)
4-
![Swift 5.0](https://img.shields.io/badge/Swift-5.0-orange.svg)
3+
[![Build Status](https://travis-ci.org/stack/Restructure.svg?branch=swift-5.1)](https://travis-ci.org/stack/Restructure)
4+
![Swift 5.1](https://img.shields.io/badge/Swift-5.0-orange.svg)
55

66
Restructure is a wrapper library for [SQLite](https://sqlite.org/index.html) for
77
iOS, macOS, and tvOS. It's fairly opinionated, as in, it does exactly what I
88
want it to do. Feel free to use it, fork it, or do what you would like with it.
99

1010
## Installation
1111

12-
Adding this repository as a git submodule is the only way to use the library.
13-
14-
1. Add this repository as a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
15-
2. Check out the tag or branch you wish to use.
16-
3. Add the `Restructure.xcodeproj` project to your existing project.
17-
4. Add the appropriate framework to your Linked Frameworks and Libraries.
18-
19-
In the future, when the dust has settled from WWDC '19, support for Swift
20-
Package Manager will be added.
12+
Starting at version 2.0.0, Restructure is a [Swift Package Manager](https://swift.org/package-manager/)
13+
project. Use the appropriate tools to include Restructure in to your project.
2114

2215
## Usage
2316

Restructure iOS Tests/Info.plist

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

Restructure iOS/Info.plist

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

Restructure iOS/Restructure_iOS.h

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

Restructure macOS Tests/Info.plist

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

0 commit comments

Comments
 (0)