Skip to content

Commit 0bca6b7

Browse files
smartersmarter
committed
Bump version from 0.1-SNAPSHOT to 0.1.1-SNAPSHOT
This is useful for two reasons: - All published Scala versions are of the form a.b.c and some tooling expect that, like sbt CrossVersion API. - Using 0.1.1 instead of 0.1.0 means that we match the version number of dotty-sbt-bridge, this is simpler and means that in the future sbt could automatically choose the correct version of dotty-sbt-bridge so that the user does not need to specify scalaCompilerBridgeSource in his build.sbt Note: it's awful that we have hardcoded paths to jars and that I had to change them, but I won't fix that now.
1 parent a909c2f commit 0bca6b7

File tree

87 files changed

+174
-180
lines changed

Some content is hidden

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

87 files changed

+174
-180
lines changed

‎compiler/test/dotc/tests.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class tests extends CompilerTest {
279279

280280
@Test def dotc_typer = compileDir(dotcDir, "typer")// twice omitted to make tests run faster
281281
// error: error while loading Checking$$anon$2$,
282-
// class file 'target/scala-2.11/dotty_2.11-0.1-SNAPSHOT.jar(dotty/tools/dotc/typer/Checking$$anon$2.class)'
282+
// class file 'target/scala-2.11/dotty_2.11-0.1.1-SNAPSHOT.jar(dotty/tools/dotc/typer/Checking$$anon$2.class)'
283283
// has location not matching its contents: contains class $anon
284284

285285
@Test def dotc_util = compileDir(dotcDir, "util") // twice omitted to make tests run faster

‎compiler/test/dotty/Jars.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package dotty
33
/** Jars used when compiling test, defaults to sbt locations */
44
object Jars {
55
val dottyLib: String = sys.env.get("DOTTY_LIB") getOrElse {
6-
"../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
6+
"../library/target/scala-2.11/dotty-library_2.11-0.1.1-SNAPSHOT.jar"
77
}
88

99
val dottyCompiler: String = sys.env.get("DOTTY_COMPILER") getOrElse {
10-
"./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar"
10+
"./target/scala-2.11/dotty-compiler_2.11-0.1.1-SNAPSHOT.jar"
1111
}
1212

1313
val dottyInterfaces: String = sys.env.get("DOTTY_INTERFACE") getOrElse {
14-
"../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
14+
"../interfaces/target/dotty-interfaces-0.1.1-SNAPSHOT.jar"
1515
}
1616

1717
val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")

‎doc-tool/test/BaseTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait DottyTest {
2323
ctx.setProperty(ContextDoc, new ContextDottydoc)
2424
ctx.setSetting(
2525
ctx.settings.classpath,
26-
"../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
26+
"../library/target/scala-2.11/dotty-library_2.11-0.1.1-SNAPSHOT.jar"
2727
)
2828
base.initialize()(ctx)
2929
ctx

‎project/Build.scala‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import sbt.Package.ManifestAttributes
1111

1212
object DottyBuild extends Build {
1313

14-
val baseVersion = "0.1"
14+
val baseVersion = "0.1.1"
1515
val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
1616

1717
val jenkinsMemLimit = List("-Xmx1500m")
@@ -414,12 +414,6 @@ object DottyBuild extends Build {
414414
"org.scala-sbt" % "api" % sbtVersion.value % "test",
415415
"org.specs2" %% "specs2" % "2.3.11" % "test"
416416
),
417-
version := {
418-
if (isNightly)
419-
"0.1.1-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
420-
else
421-
"0.1.1-SNAPSHOT"
422-
},
423417
// The sources should be published with crossPaths := false since they
424418
// need to be compiled by the project using the bridge.
425419
crossPaths := false,
@@ -455,13 +449,13 @@ object DottyInjectedPlugin extends AutoPlugin {
455449
override def trigger = allRequirements
456450
457451
override val projectSettings = Seq(
458-
scalaVersion := "0.1-SNAPSHOT",
452+
scalaVersion := "0.1.1-SNAPSHOT",
459453
scalaOrganization := "ch.epfl.lamp",
460454
scalacOptions += "-language:Scala2",
461455
scalaBinaryVersion := "2.11",
462456
autoScalaLibrary := false,
463457
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
464-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
458+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
465459
)
466460
}
467461
""")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin {
66
override def trigger = allRequirements
77

88
override val projectSettings = Seq(
9-
scalaVersion := "0.1-SNAPSHOT",
9+
scalaVersion := "0.1.1-SNAPSHOT",
1010
scalaOrganization := "ch.epfl.lamp",
1111
scalacOptions += "-language:Scala2",
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
1616
)
1717
}

‎sbt-bridge/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin {
66
override def trigger = allRequirements
77

88
override val projectSettings = Seq(
9-
scalaVersion := "0.1-SNAPSHOT",
9+
scalaVersion := "0.1.1-SNAPSHOT",
1010
scalaOrganization := "ch.epfl.lamp",
1111
scalacOptions += "-language:Scala2",
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
1616
)
1717
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin {
66
override def trigger = allRequirements
77

88
override val projectSettings = Seq(
9-
scalaVersion := "0.1-SNAPSHOT",
9+
scalaVersion := "0.1.1-SNAPSHOT",
1010
scalaOrganization := "ch.epfl.lamp",
1111
scalacOptions += "-language:Scala2",
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
1616
)
1717
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin {
66
override def trigger = allRequirements
77

88
override val projectSettings = Seq(
9-
scalaVersion := "0.1-SNAPSHOT",
9+
scalaVersion := "0.1.1-SNAPSHOT",
1010
scalaOrganization := "ch.epfl.lamp",
1111
scalacOptions += "-language:Scala2",
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
1616
)
1717
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin {
66
override def trigger = allRequirements
77

88
override val projectSettings = Seq(
9-
scalaVersion := "0.1-SNAPSHOT",
9+
scalaVersion := "0.1.1-SNAPSHOT",
1010
scalaOrganization := "ch.epfl.lamp",
1111
scalacOptions += "-language:Scala2",
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
1616
)
1717
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin {
66
override def trigger = allRequirements
77

88
override val projectSettings = Seq(
9-
scalaVersion := "0.1-SNAPSHOT",
9+
scalaVersion := "0.1.1-SNAPSHOT",
1010
scalaOrganization := "ch.epfl.lamp",
1111
scalacOptions += "-language:Scala2",
1212
scalaBinaryVersion := "2.11",
1313
autoScalaLibrary := false,
1414
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
15-
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
15+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources()
1616
)
1717
}

0 commit comments

Comments
 (0)