Skip to content

Commit

Permalink
v0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
olafurpg committed Mar 8, 2016
1 parent 61505f7 commit 767a40a
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bin/configure
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# For some odd reason the `scalafmt` is not executable when installed
# with brew. This line does the trick.
chmod u+x scalafmt
chmod u+x bin/scalafmt
9 changes: 0 additions & 9 deletions bin/publish-ghpages.sh

This file was deleted.

29 changes: 28 additions & 1 deletion bin/publish.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
#!/bin/bash
set -e

tag=$(sed -n -e 's/.*val scalafmt = "\(.*\)"/\1/p' core/src/main/scala/org/scalafmt/Versions.scala)
version="v${tag}"

read -p "Release ${version}? (y/n): " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]
then
exit 1
fi

# Run tests, create jar.
sbt assembly

# Git tag.
git tag -a ${version}
git push --tags

# maven
sbt publishSigned sonatypeRelease

Expand All @@ -14,4 +31,14 @@ git commit -m "Update ghpages."
git push -f origin gh-pages
git checkout master

# TODO(olafur) Github/Homebrew
# Github release.
github-release release \
--user olafurpg \
--repo scalafmt \
--tag ${version} \
--name "New release." \
--description "See changelog in docs." \
--file cli/target/scalafmt.tar.gz

# TODO(olafur) Homebrew release.
# TODO(olafur) IntelliJ release.
2 changes: 1 addition & 1 deletion bin/scalafmt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
java -Droot-level=error -jar PATH_TO/scalafmt.jar $@
java -jar PATH_TO/scalafmt.jar $@

4 changes: 2 additions & 2 deletions core/src/main/scala/org/scalafmt/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ package org.scalafmt
* Single source of truth for version number.
*/
object Versions {
val scalafmt = "0.1.1-SNAPSHOT"
val latestPublished = "0.1.0"
val scalafmt = "0.1.1"
val latestPublished = "0.1.1"
}
8 changes: 8 additions & 0 deletions readme/Readme.scalatex
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,14 @@
There is only one supported style at the moment: @code("ScalaStyle.Default").
More settings will come later.

@sect{Changelog}

@ul
@li
0.1.1 The @code("-f") flag in the CLI can be directory.
@li
0.1.0 First release.

@raw
<a href="https://github.com/olafurpg/scalafmt"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
<!-- Stats -->
Expand Down

0 comments on commit 767a40a

Please sign in to comment.