diff --git a/build.sbt b/build.sbt index a06d406..42b3bfe 100644 --- a/build.sbt +++ b/build.sbt @@ -1,28 +1,27 @@ name := "snappy-java" -organization := "org.xerial.snappy" +organization := "org.xerial.snappy" organizationName := "xerial.org" -description := "snappy-java: A fast compression/decompression library" +description := "snappy-java: A fast compression/decompression library" sonatypeProfileName := "org.xerial" credentials ++= { - if(sys.env.contains("SONATYPE_USERNAME") && sys.env.contains("SONATYPE_PASSWORD")) { + if (sys.env.contains("SONATYPE_USERNAME") && sys.env.contains("SONATYPE_PASSWORD")) { Seq(Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", sys.env("SONATYPE_USERNAME"), sys.env("SONATYPE_PASSWORD"))) - } - else { + } else { Seq.empty } } publishTo := Some( - if (isSnapshot.value) { - Opts.resolver.sonatypeSnapshots - } else { - Opts.resolver.sonatypeStaging - } + if (isSnapshot.value) { + Opts.resolver.sonatypeSnapshots + } else { + Opts.resolver.sonatypeStaging + } ) pomExtra := { - https://github.com/xerial/snappy-java + https://github.com/xerial/snappy-java The Apache Software License, Version 2.0 @@ -61,11 +60,11 @@ scalaVersion in ThisBuild := "2.12.4" javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.7", "-target", "1.7") javacOptions in doc := { - val opts = Seq("-source", "1.6") - if (scala.util.Properties.isJavaAtLeast("1.8")) - opts ++ Seq("-Xdoclint:none") - else - opts + val opts = Seq("-source", "1.6") + if (scala.util.Properties.isJavaAtLeast("1.8")) + opts ++ Seq("-Xdoclint:none") + else + opts } testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v") @@ -78,13 +77,13 @@ findbugsReportType := Some(FindbugsReport.FancyHtml) findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html") libraryDependencies ++= Seq( - "junit" % "junit" % "4.8.2" % "test", - "org.codehaus.plexus" % "plexus-classworlds" % "2.4" % "test", - "org.xerial.java" % "xerial-core" % "2.1" % "test", - "org.xerial" % "xerial-core" % "3.2.3" % "test", - "org.scalatest" % "scalatest_2.11" % "2.2.0" % "test", - "org.osgi" % "org.osgi.core" % "4.3.0" % "provided", - "com.novocode" % "junit-interface" % "0.10" % "test" + "junit" % "junit" % "4.8.2" % "test", + "org.codehaus.plexus" % "plexus-classworlds" % "2.4" % "test", + "org.xerial.java" % "xerial-core" % "2.1" % "test", + "org.xerial" % "xerial-core" % "3.2.3" % "test", + "org.scalatest" % "scalatest_2.11" % "2.2.0" % "test", + "org.osgi" % "org.osgi.core" % "4.3.0" % "provided", + "com.novocode" % "junit-interface" % "0.10" % "test" ) enablePlugins(SbtOsgi) @@ -96,31 +95,31 @@ OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""") OsgiKeys.additionalHeaders := Map( "Bundle-NativeCode" -> Seq( -"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x86-64", -"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x64", -"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=amd64", -"org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86", -"org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;osname=macosx;processor=x86", -"org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;osname=macosx;processor=x86-64", -"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x86-64", -"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x64", -"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=amd64", -"org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86", -"org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so;osname=linux;processor=aarch64", -"org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm", -"org/xerial/snappy/native/Linux/arm7/libsnappyjava.so;osname=linux;processor=arm_le", -"org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le", -"org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x", -"org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc", -"org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64", -"org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86", -"org/xerial/snappy/native/SunOS/x86_64/libsnappyjava.so;osname=sunos;processor=x86-64", -"org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;osname=sunos;processor=sparc" -).mkString(","), - "Bundle-DocURL" -> "http://www.xerial.org/", - "Bundle-License" -> "http://www.apache.org/licenses/LICENSE-2.0.txt", - "Bundle-ActivationPolicy" -> "lazy", - "Bundle-Name" -> "snappy-java: A fast compression/decompression library" + "org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x86-64", + "org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x64", + "org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=amd64", + "org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86", + "org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;osname=macosx;processor=x86", + "org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;osname=macosx;processor=x86-64", + "org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x86-64", + "org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x64", + "org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=amd64", + "org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86", + "org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so;osname=linux;processor=aarch64", + "org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm", + "org/xerial/snappy/native/Linux/arm7/libsnappyjava.so;osname=linux;processor=arm_le", + "org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le", + "org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x", + "org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc", + "org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64", + "org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86", + "org/xerial/snappy/native/SunOS/x86_64/libsnappyjava.so;osname=sunos;processor=x86-64", + "org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;osname=sunos;processor=sparc" + ).mkString(","), + "Bundle-DocURL" -> "http://www.xerial.org/", + "Bundle-License" -> "http://www.apache.org/licenses/LICENSE-2.0.txt", + "Bundle-ActivationPolicy" -> "lazy", + "Bundle-Name" -> "snappy-java: A fast compression/decompression library" ) import ReleaseTransformations._ @@ -143,4 +142,3 @@ releaseProcess := Seq[ReleaseStep]( releaseStepCommand("sonatypeReleaseAll"), pushChanges ) - diff --git a/project/plugins.sbt b/project/plugins.sbt index bd2501d..3bda830 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") -addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0") -addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.3") -addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2") -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.3.0") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") +addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0") +addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.3") +addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13") +addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.3.0") diff --git a/src/test/scala/org/xerial/snappy/SnappyPerformanceTest.scala b/src/test/scala/org/xerial/snappy/SnappyPerformanceTest.scala index 7eeb60d..31110dc 100644 --- a/src/test/scala/org/xerial/snappy/SnappyPerformanceTest.scala +++ b/src/test/scala/org/xerial/snappy/SnappyPerformanceTest.scala @@ -6,10 +6,9 @@ import xerial.core.log.LogLevel import scala.util.Random - /** - * - */ + * + */ class SnappyPerformanceTest extends SnappySpec { lazy val data = { @@ -21,17 +20,16 @@ class SnappyPerformanceTest extends SnappySpec { a } - "SnappyOutputStream" should { - "improve output performance" taggedAs("out") in { + "improve output performance" taggedAs ("out") in { val input = data - time("compression", repeat=100, logLevel = LogLevel.INFO) { + time("compression", repeat = 100, logLevel = LogLevel.INFO) { // 0.037 sec. => 0.026 block("default") { - val out = new ByteArrayOutputStream() + val out = new ByteArrayOutputStream() val sout = new SnappyOutputStream(out) sout.write(input) sout.close() @@ -43,8 +41,6 @@ class SnappyPerformanceTest extends SnappySpec { //info(f"compressed size: ${compressed.length}%,d, input: ${data.length}%,d") } - - } } diff --git a/src/test/scala/org/xerial/snappy/SnappySpec.scala b/src/test/scala/org/xerial/snappy/SnappySpec.scala index 1b66135..02bbb63 100644 --- a/src/test/scala/org/xerial/snappy/SnappySpec.scala +++ b/src/test/scala/org/xerial/snappy/SnappySpec.scala @@ -5,18 +5,10 @@ import xerial.core.log.Logger import xerial.core.util.Timer /** - * - */ -trait SnappySpec - extends WordSpec - with Matchers - with GivenWhenThen - with OptionValues - with BeforeAndAfter - with Timer - with Logger -{ + * + */ +trait SnappySpec extends WordSpec with Matchers with GivenWhenThen with OptionValues with BeforeAndAfter with Timer with Logger { - implicit def toTag(s:String) : Tag = Tag(s) + implicit def toTag(s: String): Tag = Tag(s) }