Merge branch 'develop' of github.com:oza/fluent-logger-scala into develop

Author: xerial

.travis.yml

@@ -1,28 +1,16 @@
 language: scala
 scala:
-  - 2.10.6
   - 2.11.8
+  - 2.12.1
 
 sudo: false
 
-script: sbt ++$TRAVIS_SCALA_VERSION test -Dloglevel=debug
+script: sbt ++$TRAVIS_SCALA_VERSION test
 
 before_install:
-  - rvm install 2.1.5
-  - rvm use 2.1
-  - gem install fluentd
+  - rvm install 2.2.0
+  - rvm use 2.2.0
+  - gem install fluentd -v 0.14.11
 
 jdk:
- - openjdk7
- - oraclejdk7
  - oraclejdk8
-
-branches:
-  only:
-    - master
-    - develop
-
-notifications:
-  email:
-    - [email protected]
-    - [email protected]

README.md

@@ -1,84 +1,57 @@
-# fluent-logger-scala -A Scala structured logger for Fluentd-
+fluent-logger-scala [![Build Status](https://travis-ci.org/fluent/fluent-logger-scala.svg?branch=develop)](https://travis-ci.org/fluent/fluent-logger-scala)
+![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.fluentd/fluent-logger-scala_2.12/badge.svg) [![Scaladoc](http://javadoc-badge.appspot.com/org.fluentd/fluent-logger-scala_2.12.svg?label=scaladoc)](http://javadoc-badge.appspot.com/org.fluentd/fluent-logger-scala_2.12)
 
-[![Build Status](https://travis-ci.org/fluent/fluent-logger-scala.svg?branch=develop)](https://travis-ci.org/fluent/fluent-logger-scala)
+====
+Fluentd logger for Scala
 
 Many web/mobile applications generate huge amount of event logs (c,f. login, logout, purchase, follow, etc). To analyze these event logs could be really valuable for improving the service. However, the challenge is collecting these logs easily and reliably.
 
-
 [Fluentd](http://github.com/fluent/fluentd) solves that problem by having: easy installation, small footprint, plugins, reliable buffering, log forwarding, etc.
 
 **fluent-logger-scala** is a Scala library, to record the events from Scala application,  based on fluent-logger-java.
 Main difference between scala and java version is to support Scala Collection.
 
 Please see [QuickStart](https://github.com/fluent/fluent-logger-scala/wiki/QuickStart) to get started!
 
-## Installation(for scala 2.10.0 or later)
-
-Add sonatype repository and dependencies to build.sbt file as follows:
-
-    resolvers += "Apache Maven Central Repository" at "http://repo.maven.apache.org/maven2/"
-
-    libraryDependencies += "org.fluentd" % "fluent-logger-scala_<scala_version>" % "0.6.0"
-
-
-Please replace ```<scala_version>``` with scala compiler version you use.
-Currently, ```<scala_version>``` can be replaced with 2.10 or 2.11.
-For instance,
-
-    libraryDependencies += "org.fluentd" % "fluent-logger-scala_2.10" % "0.6.0"
-
-or
-
-    libraryDependencies += "org.fluentd" % "fluent-logger-scala_2.11" % "0.6.0"
-
-## Installation(for scala 2.9)
-
-We provide old version of fluent-logger-scala for scala 2.9.
-
-
-    libraryDependencies += "org.fluentd" % "fluent-logger-scala_2.9.0" % "0.4.0"
+## Usage
 
-or
+```scala
+# For Scala 2.11 and 2.12 (Since fluent-logger-scala 0.7.0)
+libraryDependencies += "org.fluentd" %% "fluent-logger-scala" % "(version)"
 
-    libraryDependencies += "org.fluentd" % "fluent-logger-scala_2.9.1" % "0.4.0"
+# For Scala 2.10 users (deprecated)
+libraryDependencies += "org.fluentd" %% "fluent-logger-scala" % "0.6.0"
+```
 
-or
+### API
 
-    libraryDependencies += "org.fluentd" % "fluent-logger-scala_2.9.2" % "0.4.0"
+fluent-logger-scala API is based on fluent-logger-java:
 
+```
+FluentLoggerFactory#getLogger(tag: String): FluentLogger
+FluentLoggerFactory#getLogger(tag: String, host: String, port: Int): FluentLogger
+FluentLoggerFactory#getLogger(tag: String, host: String, port: Int, timeout: Int, bufferCapacity: Int): FluentLogger
+FluentLoggerFactory#flushAll(): Unit
+FluentLoggerFactory#closeAll(): Unit
 
+FluentLogger#log(label: String, key: String, value: Any): Boolean
+FluentLogger#log(label: String, key: String, value: Any, timestamp: Long): Boolean
+FluentLogger#log(tag:String, mutableMap/immutableMap[String, Any]):Boolean
+FluentLogger#flush()
+FluentLogger#close()
+```
 
-## API
+## For Developers
 
-APIs base on fluent-logger-java.
+```
+$ ./sbt
+> compile
+> test
+# cross Scala version testing
+> + test
+```
 
-    FluentLoggerFactory#getLogger(tag: String): FluentLogger
-    FluentLoggerFactory#getLogger(tag: String, host: String, port: Int): FluentLogger
-    FluentLoggerFactory#getLogger(tag: String, host: String, port: Int, timeout: Int, bufferCapacity: Int): FluentLogger
-    FluentLoggerFactory#flushAll(): Unit
-    FluentLoggerFactory#closeAll(): Unit
-
-    FluentLogger#log(label: String, key: String, value: Any): Boolean
-    FluentLogger#log(label: String, key: String, value: Any, timestamp: Long): Boolean
-    FluentLogger#log(tag:String, mutableMap/immutableMap[String, Any]):Boolean
-    FluentLogger#flush()
-    FluentLogger#close()
-
-## How to Build from source
-
-
-## Build
-
-    ./sbt update
-    ./sbt compile
-
-## Test
-
-    ./sbt test
-
-## For developers
-
-### Publishing to sonatype repository
+### Publishing to Maven Central
 
 Describe your account information in $HOME/.sbt/(sbt-version)/sonatype.sbt file:
 
@@ -87,16 +60,9 @@ Describe your account information in $HOME/.sbt/(sbt-version)/sonatype.sbt file:
         "(Sonatype user name)",
         "(Sonatype password)")
 
-Then publish a signed artifact to the Sonatype repository:
-
-    ./sbt publishSigned
-
-Make sure you are using a release version in build.sbt file. A SNAPSHOT version is deployed to the snapshot repostitory of Sonatype, which is not synched with Maven central. 
-
-After publishing, you can close, promote and drop the published repositorty with sonatypeRelease command:
-
-    ./sbt sonatypeRelease
+The release command will publish signed artifacts to the Sonatype repository, and perform releasing to Maven Central:
 
+    ./sbt release
 
 ## License and Copyright
 

build.sbt

@@ -1,30 +1,38 @@
-organization := "org.fluentd"
+import ReleaseTransformations._
 
+organization := "org.fluentd"
 name := "fluent-logger-scala"
 
-version := "0.6.1-SNAPSHOT"
-
 publishMavenStyle := true
-
-scalaVersion := "2.11.8"
-
-crossScalaVersions := Seq("2.10.6", scalaVersion.value)
-
-resolvers ++= Seq(
-  "Sonatype Repository" at "http://oss.sonatype.org/content/repositories/releases"
-)
-
+scalaVersion := "2.12.1"
+crossScalaVersions := Seq("2.11.8", scalaVersion.value)
 scalacOptions ++= Seq("-deprecation", "-feature", "-language:implicitConversions")
-
 logBuffered in Test := false
-
 libraryDependencies ++= Seq(
   "org.fluentd" % "fluent-logger" % "0.3.2",
-  "org.json4s" %% "json4s-native" % "3.4.0",
+  "org.json4s" %% "json4s-native" % "3.5.0",
   "junit" % "junit" % "4.12" % Test,
-  "org.xerial" % "fluentd-standalone" % "0.1.2" % Test,
-  "org.scalatest" %% "scalatest" % "3.0.0" % Test
+  "org.xerial" %% "fluentd-standalone" % "0.14.11" % Test,
+  "org.scalatest" %% "scalatest" % "3.0.1" % Test
+)
+
+// Release settings
+releaseTagName := { (version in ThisBuild).value }
+releaseProcess := Seq[ReleaseStep](
+  checkSnapshotDependencies,
+  inquireVersions,
+  runClean,
+  runTest,
+  setReleaseVersion,
+  commitReleaseVersion,
+  tagRelease,
+  ReleaseStep(action = Command.process("publishSigned", _), enableCrossBuild = true),
+  setNextVersion,
+  commitNextVersion,
+  ReleaseStep(action = Command.process("sonatypeReleaseAll", _), enableCrossBuild = true),
+  pushChanges
 )
+releaseCrossBuild := true
 
 pomExtra := (
   <url>https://github.com/fluent/fluent-logger-scala</url>

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.13

project/plugin.sbt

@@ -1,10 +1,7 @@
-
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.1")
-
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.5")
 
 scalacOptions ++= Seq("-deprecation", "-feature")