Skip to content

Upgrade to sbt 1 #3687

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.

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

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
6aafb69
sbt 1.0.0-M6
smarter Jun 6, 2017
4ce83b8
Upgrade to sbt 1.0.0-M6
smarter Jun 6, 2017
c91171d
Fix sbt bridge
ttreyer May 10, 2017
024f5fb
Add method SymDenotation.isTopLevelClass
ttreyer May 10, 2017
e1018d1
Remove SimpleType
ttreyer May 15, 2017
7865186
Update bridge for compatibility with Zinc 1.0.0-X15
ttreyer May 21, 2017
3f8a49c
Fix for zinc 1.0.0-X16
smarter Jun 6, 2017
848e41b
ExtractAPI: fix children of sealed classes
smarter Jun 6, 2017
bfd2b0f
ExtractAPI: add missing startSource callback
smarter Jun 6, 2017
d3f50a4
Fix various issues
smarter Jun 6, 2017
f02dacb
Propagate class files through GenBCode pipeline
ttreyer Jun 7, 2017
d7dba97
Catch FileConflictException creating class files
ttreyer Jun 7, 2017
fb9c611
Adapt to latest Zinc
Duhemm Oct 12, 2017
aef68c2
Compile only the bridge, not the whole compiler
Duhemm Oct 28, 2017
0f13174
Adapt to new main class detection in Zinc 1
Duhemm Oct 20, 2017
323b451
Re-enable `dist-*` projects
Duhemm Oct 23, 2017
c05353a
Fix `bin/dot*` scripts
Duhemm Oct 23, 2017
4c91ed2
Fix `source-dependencies/abstract-type-override`
Duhemm Oct 20, 2017
2cf0abe
Fix `source-dependencies/transitive-memberRef`
Duhemm Oct 20, 2017
f232fbe
Disable `source-dependencies/inherited-deps-java`
Duhemm Oct 20, 2017
494beb9
Fix test `source-dependencies/compactify`
Duhemm Oct 20, 2017
b749648
Mark test `source-dependencies/binary` pending
Duhemm Oct 20, 2017
dd7841d
Fix test source-dependencies/export-jars
Duhemm Oct 20, 2017
98c9e8d
Update test `source-dependencies/import-class`
Duhemm Nov 7, 2017
479c6c2
Fix test source-dependencies/trait-member-modified
Duhemm Oct 20, 2017
240e133
Fix test source-dependencies/java-analyis-serialization-error
Duhemm Oct 20, 2017
08e09b8
Fix test source-dependencies/canon
Duhemm Oct 20, 2017
939dd31
Fix test source-dependencies/restore-classes
Duhemm Oct 20, 2017
4ee6fd5
Fix test source-dependencies/type-alias
Duhemm Oct 20, 2017
159a19e
Fix test source-dependencies/typeref-only
Duhemm Oct 20, 2017
149c8b1
Fix test source-dependencies/less-inter-inv-java
Duhemm Oct 20, 2017
389cdcc
Fix test source-dependencies/backtick-qupted-names
Duhemm Oct 20, 2017
ca77743
Fix test source-dependencies/replace-test-a
Duhemm Oct 20, 2017
e4f092d
Fix test source-dependencies/inherited_type_params
Duhemm Oct 20, 2017
ce237c7
Fix test source-dependencies/same-file-used-names
Duhemm Oct 20, 2017
b46a4b3
Fix test source-dependencies/ext
Duhemm Oct 20, 2017
9281d1c
Fix test source-dependencies/less-inter-inv
Duhemm Oct 20, 2017
ff34abb
Fix test sbt-dotty/example-project
Duhemm Oct 20, 2017
805eceb
Fix test compilerReporter/simple
Duhemm Oct 20, 2017
4475e9e
Fix test source-dependencies/value-class-underlying
Duhemm Oct 23, 2017
5b5b260
Disable test source-dependencies/trait-private-var
Duhemm Oct 20, 2017
df2ac08
Always run scripted tests
Duhemm Nov 6, 2017
d818a2c
Split scripted tests in two groups
Duhemm Nov 7, 2017
2075f13
Remove `Message` and `Log`
Duhemm Nov 7, 2017
39ac06b
Upgrade to sbt 1.0.3
Duhemm Nov 7, 2017
f35894c
Change name of scala-library jar in tests
Duhemm Nov 7, 2017
ef10d7c
Address review comments
Duhemm Nov 8, 2017
80d36d5
Port sbt/zinc#444
Duhemm Nov 8, 2017
7705124
Address review comments
Duhemm Nov 9, 2017
e55fe0e
Merge branch 'master' of 'topic/sbt1'
allanrenucci Jan 19, 2018
5c20e2e
Update dependencies and plugins version
allanrenucci Jan 19, 2018
28b5f03
Workaround sbt/sbt#3469
allanrenucci Jan 19, 2018
db410ba
Cleanup
allanrenucci Jan 19, 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
Prev Previous commit
Next Next commit
Update dependencies and plugins version
  • Loading branch information
allanrenucci committed Jan 19, 2018
commit 5c20e2eb43d239c47bba7557b502c5bc11b608aa
18 changes: 9 additions & 9 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,9 @@ object Build {
// get libraries onboard
libraryDependencies ++= Seq(
"org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1", // used by the backend
"com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
("org.scala-lang.modules" %% "scala-xml" % "1.0.6").withDottyCompat(scalaVersion.value),
"org.scala-lang" % "scala-library" % scalacVersion % "test"
"org.scala-lang" % "scala-library" % scalacVersion % "test",
Dependencies.`compiler-interface`,
),

// For convenience, change the baseDirectory when running the compiler
Expand Down Expand Up @@ -699,7 +699,7 @@ object Build {
packageAll := {
(packageAll in `dotty-compiler`).value ++ Seq(
("dotty-compiler" -> (packageBin in Compile).value.getAbsolutePath),
("dotty-library" -> (packageBin in (dottyLibrary(Bootstrapped), Compile)).value.getAbsolutePath)
("dotty-library" -> (packageBin in (`dotty-library-bootstrapped`, Compile)).value.getAbsolutePath)
)
}
)
Expand Down Expand Up @@ -750,10 +750,10 @@ object Build {
description := "sbt compiler bridge for Dotty",
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:api
libraryDependencies ++= Seq(
"org.scala-sbt" % "compiler-interface" % "1.0.2",
("org.scala-sbt" %% "zinc-apiinfo" % "1.0.2" % "test").withDottyCompat(scalaVersion.value),
("org.specs2" %% "specs2-core" % "3.9.1" % "test").withDottyCompat(scalaVersion.value),
("org.specs2" %% "specs2-junit" % "3.9.1" % "test").withDottyCompat(scalaVersion.value)
Dependencies.`compiler-interface`,
(Dependencies.`zinc-apiinfo` % Test).withDottyCompat(scalaVersion.value),
("org.specs2" %% "specs2-core" % "3.9.1" % Test).withDottyCompat(scalaVersion.value),
("org.specs2" %% "specs2-junit" % "3.9.1" % Test).withDottyCompat(scalaVersion.value)
),
// The sources should be published with crossPaths := false since they
// need to be compiled by the project using the bridge.
Expand Down Expand Up @@ -882,11 +882,10 @@ object Build {
lazy val `sbt-dotty` = project.in(file("sbt-dotty")).
settings(commonSettings).
settings(
scalaVersion := "2.12.2",
// Keep in sync with inject-sbt-dotty.sbt
libraryDependencies ++= Seq(
Dependencies.`jackson-databind`,
"org.scala-sbt" % "compiler-interface" % "1.0.2"
Dependencies.`compiler-interface`
),
unmanagedSourceDirectories in Compile +=
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
Expand All @@ -897,6 +896,7 @@ object Build {
scriptedLaunchOpts += "-Dplugin.scalaVersion=" + dottyVersion,
// By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
scriptedBufferLog := false,
scripted := scripted.dependsOn(Def.task {
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
val x1 = (publishLocal in `dotty-interfaces`).value
Expand Down
19 changes: 18 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import java.io.FileInputStream;
import java.util.Properties

import sbt._

/** A dependency shared between multiple projects should be put here
Expand All @@ -9,4 +12,18 @@ object Dependencies {
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
val `jackson-dataformat-yaml` =
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion
}

private def readPropertyFile(file: String): Properties = {
val prop = new Properties()
val input = new FileInputStream(file)
try {
prop.load(input)
prop
}
finally input.close
}

private val sbtVersion = readPropertyFile("project/build.properties").getProperty("sbt.version")
val `compiler-interface` = "org.scala-sbt" % "compiler-interface" % sbtVersion
val `zinc-apiinfo` = "org.scala-sbt" %% "zinc-apiinfo" % sbtVersion
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.3
sbt.version=1.1.0
2 changes: 1 addition & 1 deletion project/inject-sbt-dotty.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src
// Keep in sync with `sbt-dotty` config in Build.scala
libraryDependencies ++= Seq(
Dependencies.`jackson-databind`,
"org.scala-sbt" % "compiler-interface" % "1.0.0-X16"
Dependencies.`compiler-interface`
)
unmanagedSourceDirectories in Compile +=
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config"
9 changes: 4 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@
// e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")

// Scala IDE project file generator
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.3")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")

addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.2")