Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
# Conflicts:
#	TrackMe.xcodeproj/project.pbxproj
#	TrackMe.xcodeproj/project.xcworkspace/xcuserdata/davidhohl.xcuserdatad/UserInterfaceState.xcuserstate
  • Loading branch information
fishme committed Dec 15, 2017
2 parents b63f455 + 3765b76 commit ad089fe
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 1 deletion.
36 changes: 35 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
# track-me-swift
# Stop Me Now!

Simple Stop Watch Swift app with [Sqlite DB](https://github.com/stephencelis/SQLite.swift)

## Getting Started


### Prerequisites

You will need Xcode 9.x Swift 4.x

### Installing

A step by step series of examples that tell you have to get a development env running

Say what the step will be

```
git clone https://github.com/fishme/track-me-swift
```


## Versioning

We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/your/project/tags).

## Authors

* **David Hohl** - *Initial work* - [fishme](https://github.com/fishme)

See also the list of [contributors](https://github.com/your/project/contributors) who participated in this project.

## License

This project is licensed under the MIT License.
2 changes: 2 additions & 0 deletions SQLite.swift-master/.cocoadocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
additional_guides:
- Documentation/Index.md
20 changes: 20 additions & 0 deletions SQLite.swift-master/.github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
> Issues are used to track bugs and feature requests.
> Need help or have a general question? Ask on Stack Overflow (tag sqlite.swift).
## Build Information

- Include the SQLite.swift version, commit or branch experiencing the issue.
- Mention Xcode and OS X versions affected.
- How do do you integrate SQLite.swift in your project?
- manual
- CocoaPods
- Carthage
- Swift Package manager

## General guidelines

- Be as descriptive as possible.
- Provide as much information needed to _reliably reproduce_ the issue.
- Attach screenshots if possible.
- Better yet: attach GIFs or link to video.
- Even better: link to a sample project exhibiting the issue.
27 changes: 27 additions & 0 deletions SQLite.swift-master/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# OS X
.DS_Store

# Xcode
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate

# Carthage
/Carthage/

# Swift Package Manager
.build
Packages/
Empty file added SQLite.swift-master/.gitmodules
Empty file.
1 change: 1 addition & 0 deletions SQLite.swift-master/.swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0
27 changes: 27 additions & 0 deletions SQLite.swift-master/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
language: objective-c
rvm: 2.3
osx_image: xcode9
env:
global:
- IOS_SIMULATOR="iPhone 6s"
- IOS_VERSION="11.0"
matrix:
include:
- env: BUILD_SCHEME="SQLite iOS"
- env: BUILD_SCHEME="SQLite Mac"
- env: VALIDATOR_SUBSPEC="none"
- env: VALIDATOR_SUBSPEC="standard"
- env: VALIDATOR_SUBSPEC="standalone"
- env: VALIDATOR_SUBSPEC="SQLCipher"
- env: CARTHAGE_PLATFORM="iOS"
- env: CARTHAGE_PLATFORM="Mac"
- env: CARTHAGE_PLATFORM="watchOS"
- env: CARTHAGE_PLATFORM="tvOS"
- env: PACKAGE_MANAGER_COMMAND="test"
before_install:
- gem update bundler
- gem install xcpretty --no-document
- brew update
- brew outdated carthage || brew upgrade carthage
script:
- ./run-tests.sh

0 comments on commit ad089fe

Please sign in to comment.