Skip to content

Upgrade deps #5595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 12, 2018
Merged

Upgrade deps #5595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b3f72
Bump sbt, scala and zinc version
allanrenucci Dec 11, 2018
ebbb54a
Update docker image
allanrenucci Dec 11, 2018
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
14 changes: 7 additions & 7 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ pipeline:
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
test:
group: test
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
commands:
- cp -R . /tmp/1/ && cd /tmp/1/
- ./project/scripts/sbt ";compile ;test"
- ./project/scripts/cmdTests

test_bootstrapped:
group: test
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
commands:
- cp -R . /tmp/2/ && cd /tmp/2/
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run"
- ./project/scripts/bootstrapCmdTests

test_sbt:
group: test
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
commands:
- cp -R . /tmp/4/ && cd /tmp/4/
- ./project/scripts/sbt sbt-dotty/scripted
Expand All @@ -49,7 +49,7 @@ pipeline:

# DOCUMENTATION:
documentation:
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
commands:
- ./project/scripts/genDocs
secrets: [ bot_token ]
Expand All @@ -61,7 +61,7 @@ pipeline:
# PUBLISHING:
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
publish_nightly:
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
environment:
- NIGHTLYBUILD=yes
commands:
Expand All @@ -72,7 +72,7 @@ pipeline:
environment: nightly

publish_release:
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
environment:
- RELEASEBUILD=yes
commands:
Expand All @@ -96,7 +96,7 @@ pipeline:
event: tag

publish_sbt_release:
image: lampepfl/dotty:2018-10-01
image: lampepfl/dotty:2018-12-12
environment:
- RELEASEBUILD=yes
commands:
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ object ExposedValues extends AutoPlugin {
}

object Build {
val scalacVersion = "2.12.7"
val scalacVersion = "2.12.8"

val baseVersion = "0.12.0"
val baseSbtDottyVersion = "0.2.7"
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object Dependencies {
val `jackson-dataformat-yaml` =
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion

private val zincVersion = "1.2.2"
private val zincVersion = "1.2.5"
val `compiler-interface` = "org.scala-sbt" % "compiler-interface" % zincVersion
val `zinc-api-info` = "org.scala-sbt" %% "zinc-apiinfo" % zincVersion
}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.3
sbt.version=1.2.7