Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonnam committed Jun 5, 2018
2 parents 4c604ef + f25f868 commit e94e1b6
Show file tree
Hide file tree
Showing 44 changed files with 2,518 additions and 0 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: objective-c
osx_image: xcode9.3
script:
- make release
before_deploy:
- sh Scripts/create_tag.sh
deploy:
provider: releases
api_key:
secure: vuw7o6QyCEo1M/V3IexPyRE20hkUO90SrwqHe5rI6+6RR3X9PIrqRYfo9sWmwtU0uv8dK6nqwPLXzkcF4/xHFXa8rGt+0HTd15+qtBwE+zSx/IfG7MXf2acIuPszXJwv6y6kyp5c4PB1euJsu2541ISW8TOtNO68VSXTBdzyxyA8w5c96Sg71XFHM5lPkg/Fnqw/JhcbUAG1/ICgxncWhvoY9qDJ2bE+oL7hIXvdZAK5lGu1F2zLVeKzaVkmFv8Wkcai1VIMMpKE7JJciC0KrmL2beE9QgzUUVk40DqOYZR8PJqpH3L9q74lBqqN8aIMlVThfABDRaliD+NTSvU5kIBlxfKsrbwCgohUmX89Z3zqJZmxSujy1jTCsTH7FCcZy9NdqYYOehtOEogGaa282cp9FjTEv6bfac27ZzH/AS6QWRUPr0qLbBfDgL/3379yjUctasfSoKozb2OI4xVaHNLQT6zVAx6Ha69mx396eX2Udld0Iw6He+uaEPLmzjT9pwN5DhtkBnfxAMidRBTRUE+6uLIzkNja8jjsMtmFI0bU5dE3mvUlL31ojo+mJuVKgflkGlitriAyJpuS5Y9X2bRBG7SrMINkQ5I6rNS3F00gydFt0nTywJdyAPezLD0L9QtGBpo6WWy7V/o1VEX+TCgp6oMleEHXyzx2yIBJTFA=
file: ".build/release/flint"
skip_cleanup: true
on:
branch: master
Binary file added Assets/logo.afdesign
Binary file not shown.
Binary file added Assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BIN_NAME = flint
USR_BIN_PATH = /usr/local/bin/
RELEASE_BIN_BUILD_PATH = ./.build/release/
DEBUG_BIN_BUILD_PATH = ./.build/debug/

.PHONY: all release debug build-release build-debug
install-release install-debug uninstall sync-version

all: release install-release

release: build-release
debug: build-debug install-debug

# Build
build-release:
swift build -c release -Xswiftc -static-stdlib
build-debug:
swift build -c debug -Xswiftc -static-stdlib

# Install
install-release:
cp -f $(RELEASE_BIN_BUILD_PATH)$(BIN_NAME) $(USR_BIN_PATH)$(BIN_NAME)
install-debug:
cp -f $(DEBUG_BIN_BUILD_PATH)$(BIN_NAME) $(USR_BIN_PATH)$(BIN_NAME)
uninstall:
rm $(USR_BIN_PATH)$(BIN_NAME)

sync-version:
swift Scripts/SyncVersion.swift
61 changes: 61 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"object": {
"pins": [
{
"package": "ANSIEscapeCode",
"repositoryURL": "https://github.com/flintbox/ANSIEscapeCode",
"state": {
"branch": null,
"revision": "892f5f3067ea4c029af05cb45efb3b6a3be2f838",
"version": "0.1.1"
}
},
{
"package": "Bouncer",
"repositoryURL": "https://github.com/flintbox/Bouncer",
"state": {
"branch": null,
"revision": "a24a3d616b78ed4a7756edc4999c515f3adfd0dd",
"version": "0.1.2"
}
},
{
"package": "Motor",
"repositoryURL": "https://github.com/flintbox/Motor",
"state": {
"branch": null,
"revision": "8a203ff30aa38ab376a8da4390eb1c3d6519054b",
"version": "0.1.1"
}
},
{
"package": "PathFinder",
"repositoryURL": "https://github.com/jasonnam/PathFinder",
"state": {
"branch": "develop",
"revision": "cac8c10d26da0a77b1d3775c167b77e331bc847b",
"version": null
}
},
{
"package": "Work",
"repositoryURL": "https://github.com/flintbox/Work",
"state": {
"branch": null,
"revision": "dcfc835ade72e4de743b6a14d3f224ebf575eac5",
"version": "0.1.0"
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "618582e09699b577fa183bab7d88e3ee7d9a1d19",
"version": "1.0.0"
}
}
]
},
"version": 1
}
25 changes: 25 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// swift-tools-version:4.0

import PackageDescription

let package = Package(
name: "Flint",
products: [
.executable(
name: "flint",
targets: ["Flint"]),
],
dependencies: [
.package(url: "https://github.com/flintbox/Bouncer", from: "0.1.2"),
.package(url: "https://github.com/flintbox/Motor", from: "0.1.1"),
.package(url: "https://github.com/flintbox/Work", from: "0.1.0"),
.package(url: "https://github.com/flintbox/ANSIEscapeCode", from: "0.1.1"),
.package(url: "https://github.com/jasonnam/PathFinder", .branch("develop")),
.package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"),
],
targets: [
.target(
name: "Flint",
dependencies: ["Bouncer", "Motor", "Work", "ANSIEscapeCode", "PathFinder", "Yams"]),
]
)
Loading

0 comments on commit e94e1b6

Please sign in to comment.