Skip to content

Commit

Permalink
Merge pull request #10796 from scala-steward/update/sbt-1.5.0
Browse files Browse the repository at this point in the history
Update sbt to 1.5.0
  • Loading branch information
mergify[bot] committed Apr 6, 2021
2 parents e2ab0ed + 35fb73b commit 2ba2f15
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
- secure: "NS2hMbBcmi6EF4QxtcNs4A2ZuNmIdLYQRJUWWejgnD4YtcsmoVjxrHRedqrnDdui4DyvaxWhg/3Uds23jEKTSbbh3ZphLO77BVgM2nUGUvVoa4i6qGF2eZFlIhq2G1gM700GPV7X4KmyjYi2HtH8CWBTkqP3g0An63mCZw/Gnlk="
# These are the versions used for (scripted) tests. The versions Play is build with however are defined in interplay.
- SCRIPTED_SBT_1_3: "1.3.13"
- SCRIPTED_SBT_1_4: "1.4.9"
- SCRIPTED_SBT_1_5: "1.5.0"
- TEST_SCALA_2_12: "2.12.13"
- TEST_SCALA_2_13: "2.13.5"
jobs:
Expand All @@ -38,7 +38,7 @@ stages:
- test
- test-sbt-1.3.x
- cron-test-sbt-1.3.x
- cron-test-sbt-1.4.x
- cron-test-sbt-1.5.x
- java8

jobs:
Expand Down Expand Up @@ -128,10 +128,10 @@ jobs:
if: type = cron
workspaces:
use: published-local
# Test against sbt 1.4.x, but only for cron builds
- stage: cron-test-sbt-1.4.x
name: "Run tests for 1.4.x and Scala 2.13.x"
script: scripts/test-scripted $SCRIPTED_SBT_1_4 $TEST_SCALA_2_13
# Test against sbt 1.5.x, but only for cron builds
- stage: cron-test-sbt-1.5.x
name: "Run tests for 1.5.x and Scala 2.13.x"
script: scripts/test-scripted $SCRIPTED_SBT_1_5 $TEST_SCALA_2_13
if: type = cron
workspaces:
use: published-local
Expand Down
2 changes: 1 addition & 1 deletion documentation/project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright (C) Lightbend Inc. <https://www.lightbend.com>
#
# sync with project/build.properties
sbt.version=1.4.9
sbt.version=1.5.0
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright (C) Lightbend Inc. <https://www.lightbend.com>
#
# sync with documentation/project/build.properties
sbt.version=1.4.9
sbt.version=1.5.0

0 comments on commit 2ba2f15

Please sign in to comment.