Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrates from mezzo to freestyle-rpc style, license, etc. #4

Merged
merged 2 commits into from
Jun 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
project/boot
*.class
*.log

# sbt specific
.cache
.history
.lib/
dist/*
target
lib_managed/
src_managed/
project/boot/
project/plugins/project/

# Scala-IDE specific
.scala_dependencies
.worksheet

# ENSIME specific
.ensime_cache/
.ensime
.ensime_lucene
.ensime_cache
TAGS
\#*#
*~
.#*
.lib
.history
.*.swp
.idea
.idea/*
.idea_modules

# IDEA Specific
.idea/
*.iws
/out/
.idea_modules/

.DS_Store
.sbtrc
*.sublime-project
*.sublime-workspace
tests.iml
*.log
metastore_db/
checkpoint/
testData/
.phantom-temp

/secring.gpg
22 changes: 22 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
style = defaultWithAlign
maxColumn = 100

continuationIndent.callSite = 2

newlines {
sometimesBeforeColonInMethodReturnType = false
}

align {
arrowEnumeratorGenerator = false
ifWhileOpenParen = false
openParenCallSite = false
openParenDefnSite = false
}

docstrings = JavaDoc

rewrite {
rules = [SortImports, RedundantBraces]
redundantBraces.maxLines = 1
}
52 changes: 33 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,44 @@
language: scala
jdk:
- oraclejdk8

scala:
- 2.12.1
- 2.11.8
- 2.11.11
- 2.12.2

#install:
#- pip install --user codecov
jdk:
- oraclejdk8

script:
- sbt ++$TRAVIS_SCALA_VERSION validate
#- sbt ++$TRAVIS_SCALA_VERSION coverage validate coverageReport
#- codecov
before_cache:
- du -h -d 1 $HOME/.ivy2/
- du -h -d 2 $HOME/.sbt/
- du -h -d 4 $HOME/.coursier/
- find $HOME/.sbt -name "*.lock" -type f -delete
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -type f -delete

cache:
directories:
- $HOME/.sbt/cache
- $HOME/.sbt/0.13
- $HOME/.sbt/boot/
- $HOME/.sbt/boot/scala*
- $HOME/.sbt/cache
- $HOME/.sbt/launchers
- $HOME/.ivy2/cache
- $HOME/.ivy2
- $HOME/.coursier
before_cache:
- du -h -d 1 $HOME/.ivy2/
- du -h -d 2 $HOME/.sbt/
- du -h -d 4 $HOME/.coursier/
- find $HOME/.sbt -name "*.lock" -type f -delete
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -type f -delete
- find $HOME/.coursier/cache -name "*.lock" -type f -delete

before_install:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
openssl aes-256-cbc -K $encrypted_80bb47bfd841_key -iv $encrypted_80bb47bfd841_iv -in secring.gpg.enc -out secring.gpg -d;
fi
- export PATH=${PATH}:./vendor/bundle

install:
- rvm use 2.2.3 --install --fuzzy
- gem update --system
- gem install sass
- gem install jekyll -v 3.4.3

script:
- sbt ++$TRAVIS_SCALA_VERSION orgScriptCI

after_success:
- bash <(curl -s https://codecov.io/bash) -t token_replace-me
- sbt ++$TRAVIS_SCALA_VERSION orgAfterCISuccess
12 changes: 12 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Authors

## Maintainers

The maintainers of the project are:

* 47 Degrees (twitter: @47deg) <[47degfreestyle](https://github.com/47degfreestyle)>

## Contributors

These are the people that have contributed to the freestyle-rpc project:

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Changelog
27 changes: 27 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Contributing

Discussion around Freestyle happens in the [Gitter channel](https://gitter.im/47deg/freestyle) as well as on
[GitHub issues](https://github.com/47deg/freestyle/issues) and [pull requests](https://github.com/47deg/freestyle/pulls).

Feel free to open an issue if you notice a bug, have an idea for a feature, or have a question about
the code. Pull requests are also welcome.

People are expected to follow the [Typelevel Code of Conduct](http://typelevel.org/conduct.html) when discussing Freestyle on the Github page, Gitter channel, or other venues.

If you are being harassed, please contact one of [us](AUTHORS.md#maintainers) immediately so that we can support you. In case you cannot get in touch with us please write an email to [47 Degrees](mailto:hello@47deg.com).

## How can I help?

Freestyle follows a standard [fork and pull](https://help.github.com/articles/using-pull-requests/) model for contributions via GitHub pull requests.

The process is simple:

1. Find something you want to work on
2. Let us know you are working on it via the Gitter channel or GitHub issues/pull requests
3. Implement your contribution
4. Write tests
5. Update the documentation
6. Submit pull request

You will be automatically included in the [AUTHORS.md](AUTHORS.md#contributors) file as contributor in the next release.
If you encounter any confusion or frustration during the contribution process, please create a GitHub issue and we'll do our best to improve the process.
13 changes: 0 additions & 13 deletions COPYING

This file was deleted.

Loading