Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,9 @@ jobs:
name: Update PATH
command: 'export PATH="$HOME/sbt/bin:$PATH"'

- publish_snapshots:
release_suffix: play25
play_version: 2.5.7
scala_versions: 2.11.12

- publish_snapshots:
release_suffix: play26
play_version: 2.6.7
play_version: 2.6.14
scala_versions: 2.11.12 2.12.20

- publish_snapshots:
Expand Down Expand Up @@ -226,19 +221,13 @@ workflows:
main_suite:
max_auto_reruns: 3
jobs:
- unit_test_suite:
name: unit_play25
release_suffix: play25
play_version: 2.5.11
scala_version: 2.11.12

- unit_test_suite:
name: unit_play26
release_suffix: play26
shaded: false
openjdk_version: 8
scala_version: 2.12.20
play_version: 2.6.7
play_version: 2.6.14

- unit_test_suite:
name: unit_play27
Expand Down Expand Up @@ -280,7 +269,6 @@ workflows:
only:
- master
requires:
- unit_play25
- unit_play26
- unit_play27
- unit_play28
Expand Down
2 changes: 0 additions & 2 deletions compat/src/test/scala/ValueConverterSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ object PlayFixtures {
}
import java.time.{ Duration => JDuration }

import TestCompat._

case class Foo(
int: Int,
short: Short,
Expand Down
2 changes: 1 addition & 1 deletion project/Compiler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object Compiler {
"1.7.19"
}

val scala3Lts = "3.3.6"
val scala3Lts = "3.3.7"

lazy val settings = Seq(
scalaVersion := "2.12.20",
Expand Down
6 changes: 3 additions & 3 deletions project/Release.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Release {
private def createLocalBranch(f: (String, String) => String) = Def.setting {
val vcs = releaseVcs.value.get
val ver = version.value
val next = Version(_: String).map(_.withoutQualifier.string).getOrElse(???)
val next = Version(_: String).map(_.withoutQualifier.unapply).getOrElse(???)
val releaseBranch = f(ver, next(ver))

ReleaseStep(action = { st =>
Expand Down Expand Up @@ -81,13 +81,13 @@ object Release {
val settings = Seq(
releaseVersion := { ver =>
Version(ver)
.map(_.withoutQualifier.string)
.map(_.withoutQualifier.unapply)
.getOrElse(sbtrelease.versionFormatError(ver))
},
releaseNextVersion := { ver =>
// e.g. 1.2 => 1.3-SNAPSHOT
Version(ver)
.map(_.bumpBugfix.asSnapshot.string)
.map(_.bumpBugfix.asSnapshot.unapply)
.getOrElse(sbtrelease.versionFormatError(ver))
},
releaseCommitMessage := {
Expand Down
5 changes: 1 addition & 4 deletions project/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ unset REACTIVEMONGO_SHADED

TASKS=";makePom ;packageBin ;packageSrc ;packageDoc"

export RELEASE_SUFFIX=play25 PLAY_VERSION=2.5.7
sbt $SBT_OPTS ++${S2_11} clean "$TASKS"

export RELEASE_SUFFIX=play26 PLAY_VERSION=2.6.7
export RELEASE_SUFFIX=play26 PLAY_VERSION=2.6.14
sbt $SBT_OPTS ++${S2_11} "$TASKS" ++${S2_12} "$TASKS"

export RELEASE_SUFFIX=play27 PLAY_VERSION=2.7.4
Expand Down