Skip to content

Commit 92fcd92

Browse files
felixmulderfelixmulder
authored
Merge pull request #1734 from felixmulder/topic/add-drone
[WIP] add drone
2 parents 6bba767 + 8253cd0 commit 92fcd92

File tree

86 files changed

+126
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+126
-96
lines changed

‎.drone.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
pipeline:
2+
test:
3+
image: felixmulder/dotty:0.1
4+
pull: true
5+
commands:
6+
- ln -s /var/cache/drone/scala-scala scala-scala
7+
- sbt -Ddotty.drone.mem=4096m -ivy /var/cache/drone/ivy2 "${TEST}"
8+
9+
matrix:
10+
TEST:
11+
- test
12+
- partest-only-no-bootstrap --show-diff --verbose
13+
- partest-only --show-diff --verbose

‎compiler/test/dotty/partest/DPConsoleRunner.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat
105105
val seqResults =
106106
if (!sequentialTests.isEmpty) {
107107
val savedThreads = sys.props("partest.threads")
108-
sys.props("partest.threads") = "1"
108+
sys.props("partest.threads") = "2"
109109

110-
NestUI.echo(s"## we will run ${sequentialTests.length} tests sequentially")
110+
NestUI.echo(s"## we will run ${sequentialTests.length} tests using ${PartestDefaults.numThreads} thread(s)")
111111
val res = super.runTestsForFiles(sequentialTests, kind)
112112

113113
if (savedThreads != null)
@@ -120,7 +120,7 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat
120120

121121
val parResults =
122122
if (!parallelTests.isEmpty) {
123-
NestUI.echo(s"## we will run ${parallelTests.length} tests in parallel using ${PartestDefaults.numThreads} threads")
123+
NestUI.echo(s"## we will run ${parallelTests.length} tests in parallel using ${PartestDefaults.numThreads} thread(s)")
124124
super.runTestsForFiles(parallelTests, kind)
125125
} else Array[TestState]()
126126

‎docs/CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎project/Build.scala

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ object DottyBuild extends Build {
1717
val jenkinsMemLimit = List("-Xmx1500m")
1818

1919
val JENKINS_BUILD = "dotty.jenkins.build"
20+
val DRONE_MEM = "dotty.drone.mem"
2021

2122
val scalaCompiler = "me.d-d" % "scala-compiler" % "2.11.5-20160322-171045-e19b30b3cd"
2223

@@ -83,13 +84,19 @@ object DottyBuild extends Build {
8384

8485

8586
/** Projects -------------------------------------------------------------- */
87+
88+
// Needed because the dotty project aggregates dotty-sbt-bridge but dotty-sbt-bridge
89+
// currently refers to dotty in its scripted task and "aggregate" does not take by-name
90+
// parameters: https://github.com/sbt/sbt/issues/2200
91+
lazy val dottySbtBridgeRef = LocalProject("dotty-sbt-bridge")
92+
8693
// The root project:
8794
// - aggregates other projects so that "compile", "test", etc are run on all projects at once.
8895
// - publishes its own empty artifact "dotty" that depends on "dotty-library" and "dotty-compiler",
8996
// this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name
9097
lazy val dotty = project.in(file(".")).
9198
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
92-
aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-sbt-bridge`, `scala-library`).
99+
aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, dottySbtBridgeRef, `scala-library`).
93100
dependsOn(`dotty-compiler`).
94101
dependsOn(`dotty-library`).
95102
settings(
@@ -335,9 +342,11 @@ object DottyBuild extends Build {
335342
path.contains("sbt-interface")
336343
} yield "-Xbootclasspath/p:" + path
337344

338-
val travis_build = // propagate if this is a travis build
345+
val ci_build = // propagate if this is a ci build
339346
if (sys.props.isDefinedAt(JENKINS_BUILD))
340347
List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: jenkinsMemLimit
348+
else if (sys.props.isDefinedAt(DRONE_MEM))
349+
List("-Xmx" + sys.props(DRONE_MEM))
341350
else List()
342351

343352
val tuning =
@@ -346,7 +355,7 @@ object DottyBuild extends Build {
346355
List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1")
347356
else List()
348357

349-
("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: path.toList
358+
("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: ci_build ::: path.toList
350359
}
351360
).
352361
settings(publishing)
@@ -380,7 +389,7 @@ object DottyBuild extends Build {
380389
overrideScalaVersionSetting,
381390

382391
cleanSbtBridge := {
383-
val dottyBridgeVersion = version.value
392+
val dottySbtBridgeVersion = version.value
384393
val dottyVersion = (version in `dotty-compiler`).value
385394
val classVersion = System.getProperty("java.class.version")
386395

@@ -392,8 +401,8 @@ object DottyBuild extends Build {
392401
val org = organization.value
393402
val artifact = moduleName.value
394403

395-
IO.delete(file(home) / ".ivy2" / "cache" / sbtOrg / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion")
396-
IO.delete(file(home) / ".sbt" / "boot" / s"scala-$sbtScalaVersion" / sbtOrg / "sbt" / sbtV / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion")
404+
IO.delete(file(home) / ".ivy2" / "cache" / sbtOrg / s"$org-$artifact-$dottySbtBridgeVersion-bin_${dottyVersion}__$classVersion")
405+
IO.delete(file(home) / ".sbt" / "boot" / s"scala-$sbtScalaVersion" / sbtOrg / "sbt" / sbtV / s"$org-$artifact-$dottySbtBridgeVersion-bin_${dottyVersion}__$classVersion")
397406
},
398407
publishLocal := (publishLocal.dependsOn(cleanSbtBridge)).value,
399408
description := "sbt compiler bridge for Dotty",
@@ -423,7 +432,14 @@ object DottyBuild extends Build {
423432
settings(
424433
ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test",
425434
ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"),
426-
ScriptedPlugin.scriptedBufferLog := false
435+
ScriptedPlugin.scriptedBufferLog := false,
436+
ScriptedPlugin.scripted := {
437+
val x1 = (publishLocal in `dotty-interfaces`).value
438+
val x2 = (publishLocal in `dotty-compiler`).value
439+
val x3 = (publishLocal in `dotty-library`).value
440+
val x4 = (publishLocal in dotty).value // Needed because sbt currently hardcodes the dotty artifact
441+
ScriptedPlugin.scriptedTask.evaluated
442+
}
427443
// TODO: Use this instead of manually copying DottyInjectedPlugin.scala
428444
// everywhere once https://github.com/sbt/sbt/issues/2601 gets fixed.
429445
/*,
@@ -443,7 +459,7 @@ object DottyInjectedPlugin extends AutoPlugin {
443459
scalaBinaryVersion := "2.11",
444460
autoScalaLibrary := false,
445461
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
446-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
462+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
447463
)
448464
}
449465
""")
@@ -524,12 +540,14 @@ object DottyInjectedPlugin extends AutoPlugin {
524540
val fullpath = ("-Xbootclasspath/a:" + bin) :: path.toList
525541
// System.err.println("BOOTPATH: " + fullpath)
526542

527-
val travis_build = // propagate if this is a travis build
543+
val ci_build = // propagate if this is a ci build
528544
if (sys.props.isDefinedAt(JENKINS_BUILD))
529545
List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}")
546+
else if (sys.props.isDefinedAt(DRONE_MEM))
547+
List("-Xmx" + sys.props(DRONE_MEM))
530548
else
531549
List()
532-
val res = agentOptions ::: travis_build ::: fullpath
550+
val res = agentOptions ::: ci_build ::: fullpath
533551
println("Running with javaOptions: " + res)
534552
res
535553
}

‎sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ object DottyInjectedPlugin extends AutoPlugin {
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
1616
)
1717
}

0 commit comments

Comments
 (0)