From bcca51da626aa318d8918dd4e20ec1a3fd09962d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:05:46 +0000 Subject: [PATCH 1/8] build: fix versions in travis ci --- .travis.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2516428..cf26785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,15 @@ language: scala scala: - - 2.12.4 - - 2.11.11 - - 2.10.6 + - 2.13.1 + - 2.12.10 + - 2.11.12 jdk: - - oraclejdk8 - - oraclejdk7 - - openjdk7 + - openjdk8 + - openjdk10 + - openjdk11 matrix: - exclude: - - scala: 2.12.4 - jdk: oraclejdk7 - - scala: 2.12.4 + include: + - scala: 2.11.12 jdk: openjdk7 script: - sbt ++$TRAVIS_SCALA_VERSION "set concurrentRestrictions in Global := Seq(Tags.limit(Tags.Test, 1))" clean coverage test From b93de7a27a6e857b7f617007ab4d7f2291155522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:06:03 +0000 Subject: [PATCH 2/8] build: fix bug on jvm7 source --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index e129913..719fba2 100644 --- a/build.sbt +++ b/build.sbt @@ -32,8 +32,8 @@ unmanagedSourceDirectories in Compile += { val v = javaVersion.value val dir = (sourceDirectory in Compile).value - if (v.startsWith("1.8")) dir / "java_8" - else dir / "java_7" + if (v.startsWith("1.7.")) dir / "java_7" + else dir / "java_8" } scalacOptions in Test ++= Seq("-Yrangepos") From d87b866ead12412f12ca0663611384d8316d6e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:06:18 +0000 Subject: [PATCH 3/8] build: update specs2 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 719fba2..ac54dc7 100644 --- a/build.sbt +++ b/build.sbt @@ -7,10 +7,10 @@ version := "0.5.0-SNAPSHOT" scalaVersion := "2.13.1" -crossScalaVersions := Seq("2.11.12", "2.12.10") +crossScalaVersions := Seq("2.12.10", "2.11.12") libraryDependencies ++= Seq( - "org.specs2" %% "specs2-core" % "4.7.1" % "test") + "org.specs2" %% "specs2-core" % "4.8.1" % "test") resolvers ++= Seq( "snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", From 26477684481ed561407e56955275881ae54258e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:06:26 +0000 Subject: [PATCH 4/8] test: scala.compat.Platform is deprecated --- src/test/scala/io/github/andrebeat/pool/PoolSpec.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/scala/io/github/andrebeat/pool/PoolSpec.scala b/src/test/scala/io/github/andrebeat/pool/PoolSpec.scala index 417d85e..48e6863 100644 --- a/src/test/scala/io/github/andrebeat/pool/PoolSpec.scala +++ b/src/test/scala/io/github/andrebeat/pool/PoolSpec.scala @@ -2,7 +2,6 @@ package io.github.andrebeat.pool import java.util.concurrent.BlockingQueue import org.specs2.mutable.Specification -import scala.compat.Platform import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{ blocking, Future } import scala.concurrent.duration._ @@ -251,7 +250,7 @@ abstract class PoolSpec[P[_ <: AnyRef] <: Pool[_]](implicit ct: ClassTag[P[_]]) p.size() === 3 i === 3 - Platform.collectGarbage + java.lang.System.gc(); p.acquire() From 6beeeee8cccb57ff12d053c66ffbe74ac90d49e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:13:44 +0000 Subject: [PATCH 5/8] build: remove openjdk10 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf26785..c17ec19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ scala: - 2.11.12 jdk: - openjdk8 - - openjdk10 - openjdk11 matrix: include: From 9780a5eb5a96f0e7a0c1863e978aa48a17140086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:13:58 +0000 Subject: [PATCH 6/8] build: bump sbt to 0.13.18 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c091b86..8e682c5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=0.13.18 From 28ff2c25c4b51930da32a0b63ff5a1290068902a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:22:48 +0000 Subject: [PATCH 7/8] build: update sbt plugins --- project/plugins.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 888490c..039b7f4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,13 +1,13 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.2") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.3") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") +addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") From 5fe8be1af407f0b8c03515f1cf92ea18c05dbc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 23 Nov 2019 17:52:07 +0000 Subject: [PATCH 8/8] build: openjdk7 is only available on travis precise dist --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c17ec19..23e2f78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,8 @@ jdk: - openjdk11 matrix: include: - - scala: 2.11.12 + - dist: precise + scala: 2.11.12 jdk: openjdk7 script: - sbt ++$TRAVIS_SCALA_VERSION "set concurrentRestrictions in Global := Seq(Tags.limit(Tags.Test, 1))" clean coverage test