diff --git a/.circleci/config.yml b/.circleci/config.yml index c7120f4..d6724d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -286,7 +286,7 @@ jobs: play_json_version: 2.8.1 variant: Play 2.8, WS 2.1 - common_scala31_play28_jdk11: + common_scala3_play29_jdk11: docker: - image: cimg/openjdk:11.0 @@ -296,11 +296,11 @@ jobs: - test_suite: java_version: openjdk11 modules: core vfs play - scala_version: 3.2.1 + scala_version: 3.4.2 ws_version: 2.2.0-M1+68-da80b259-SNAPSHOT - play_version: 2.8.11 - play_json_version: 2.10.0-RC6 - variant: Play 2.8, WS 2.8 + play_version: 2.9.5 + play_json_version: 2.10.6 + variant: Play 2.9, WS 2.8 # --- Integration: S3/Google --- # @@ -330,7 +330,7 @@ jobs: play_version: 2.7.1 variant: Play 2.7, WS 2.0 - int_scala31_play28_jdk11: + int_scala3_play29_jdk11: docker: - image: cimg/openjdk:11.0 @@ -340,11 +340,11 @@ jobs: - test_suite: java_version: openjdk11 modules: s3 google - scala_version: 3.2.1 + scala_version: 3.4.2 ws_version: 2.2.0-M1+68-da80b259-SNAPSHOT - play_version: 2.8.11 - play_json_version: 2.10.0-RC6 - variant: Play 2.8, WS 2.8 + play_version: 2.9.5 + play_json_version: 2.10.6 + variant: Play 2.9, WS 2.8 # --- Master jobs --- # @@ -384,11 +384,11 @@ jobs: scala_versions: 2.13.14 - publish_snapshots: - release_suffix: play28 + release_suffix: play29 ws_version: 2.2.0-M1+68-da80b259-SNAPSHOT - play_version: 2.8.11 - play_json_version: 2.10.0-RC6 - scala_versions: 3.2.1 + play_version: 2.9.5 + play_json_version: 2.10.6 + scala_versions: 3.4.2 # TODO: play29 - publish_snapshots: @@ -427,7 +427,7 @@ workflows: - common_scala211_jdk8 - common_scala212_play27_jdk8 - common_scala213_play28_jdk9 - - common_scala31_play28_jdk11 + - common_scala3_play29_jdk11 # S3/Google - int_scala211_jdk8: @@ -437,9 +437,9 @@ workflows: requires: - common_scala212_play27_jdk8 - int_scala211_jdk8 - - int_scala31_play28_jdk11: + - int_scala3_play29_jdk11: requires: - - common_scala31_play28_jdk11 + - common_scala3_play29_jdk11 - int_scala212_play27_jdk8 # Master @@ -451,7 +451,7 @@ workflows: requires: - int_scala211_jdk8 - int_scala212_play27_jdk8 - - int_scala31_play28_jdk11 + - int_scala3_play29_jdk11 - examples: filters: diff --git a/build.sbt b/build.sbt index f495ba2..317cd26 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ ThisBuild / crossScalaVersions := Seq( "2.11.12", scalaVersion.value, "2.13.14", - "3.2.1" + "3.4.2" ) lazy val core = project diff --git a/core/src/main/scala/Streams.scala b/core/src/main/scala/Streams.scala index de85086..c1c0c7c 100644 --- a/core/src/main/scala/Streams.scala +++ b/core/src/main/scala/Streams.scala @@ -58,7 +58,6 @@ private[benji] object Streams { OutHandler } import akka.stream.{ Attributes, FlowShape, Inlet, Outlet } - import akka.util.ByteString private class ChunkOfAtMost(limit: Int) extends GraphStage[FlowShape[ByteString, Chunk]] { diff --git a/project/Common.scala b/project/Common.scala index d18336c..364f7a9 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -63,7 +63,11 @@ object Common extends AutoPlugin { Seq( "-Wunused:all", "-language:implicitConversions", - "-Wconf:cat=deprecation&msg=.*(fromFuture|ActorMaterializer).*:s" + "-Wconf:cat=deprecation&msg=.*(fromFuture|ActorMaterializer).*:s", + "-Wconf:msg=.*deprecated\\ for\\ wildcard\\ arguments.*:s", + "-Wconf:msg=.*has\\ been\\ deprecated.*\\ uninitialized.*:s", + "-Wconf:msg=.*should\\ not\\ .*infix\\ operator.*:s", + "-Wconf:msg=.*vararg\\ splices.*:s" ) } }, diff --git a/project/build.sh b/project/build.sh index 7a1aed1..9766c69 100755 --- a/project/build.sh +++ b/project/build.sh @@ -3,9 +3,9 @@ set -e S2_11="2.11.12" -S2_12="2.12.17" -S2_13="2.13.8" -S3_1="3.2.1" +S2_12="2.12.19" +S2_13="2.13.14" +S3="3.4.2" # Play 2.6.x export PLAY_VERSION=2.6.7 PLAY_JSON_VERSION=2.6.7 WS_VERSION=1.1.6 @@ -17,9 +17,9 @@ export PLAY_VERSION=2.7.1 PLAY_JSON_VERSION=2.7.4 WS_VERSION=2.0.6 sbt ++${S2_12} makePom packageBin packageSrc packageDoc # Play 2.8.x -export PLAY_VERSION=2.8.0 PLAY_JSON_VERSION=2.8.1 WS_VERSION=2.1.2 +export PLAY_VERSION=2.8.11 PLAY_JSON_VERSION=2.8.1 WS_VERSION=2.1.2 sbt ++${S2_13} makePom packageBin packageSrc packageDoc # Scala 3 -export PLAY_VERSION=2.8.11 PLAY_JSON_VERSION=2.10.0-RC5 WS_VERSION=2.2.0-M1+68-da80b259-SNAPSHOT -sbt ++${S3_1} makePom packageBin packageSrc packageDoc +export PLAY_VERSION=2.9.5 PLAY_JSON_VERSION=2.10.6 WS_VERSION=2.2.0-M1+68-da80b259-SNAPSHOT +sbt ++${S3} makePom packageBin packageSrc packageDoc diff --git a/project/deploy.sh b/project/deploy.sh index 1e31ae4..096f4f5 100755 --- a/project/deploy.sh +++ b/project/deploy.sh @@ -43,8 +43,8 @@ if [ "x$SCALA_MODULES" = "x" ]; then SCALA_MODULES="core:benji-core s3:benji-s3 google:benji-google vfs:benji-vfs play:benji-play" fi -SCALA_VERSIONS="2.11 2.12 2.13 3.2.1" -PLAY_VERSIONS="26 27 28" +SCALA_VERSIONS="2.11 2.12 2.13 3.4.2" +PLAY_VERSIONS="26 27 28 29" BASES=""