Skip to content

Commit

Permalink
Build for Scala 2.13.0-M5
Browse files Browse the repository at this point in the history
See #540
  • Loading branch information
thesamet committed Mar 16, 2019
1 parent 5fe0d92 commit 3d87c99
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ stages:
scala:
- 2.11.12
- 2.12.8
- 2.13.0-M5

env:
- TEST_SCRIPT=e2e.sh E2E_SHADED=0
Expand Down
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ val Scala211 = "2.11.12"

val Scala212 = "2.12.8"

val Scala213 = "2.13.0-M5"

val protobufVersion = "3.7.0"

val scalacheckVersion = "1.14.0"
Expand All @@ -20,7 +22,7 @@ val MimaPreviousVersion = "0.9.0-RC1"

scalaVersion in ThisBuild := Scala212

crossScalaVersions in ThisBuild := Seq(Scala211, Scala212)
crossScalaVersions in ThisBuild := Seq(Scala211, Scala212, Scala213)

scalacOptions in ThisBuild ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down Expand Up @@ -162,7 +164,7 @@ shadeTarget in ThisBuild := s"scalapbshade.v${version.value.replaceAll("[.-]","_

lazy val compilerPlugin = project.in(file("compiler-plugin"))
.settings(
crossScalaVersions := Seq(Scala210, Scala211, Scala212),
crossScalaVersions := Seq(Scala210, Scala211, Scala212, Scala213),
sourceGenerators in Compile += Def.task {
val file = (sourceManaged in Compile).value / "scalapb" / "compiler" / "Version.scala"
IO.write(file,
Expand Down Expand Up @@ -202,7 +204,7 @@ lazy val compilerPluginShaded = project.in(file("compiler-plugin-shaded"))
.dependsOn(compilerPlugin)
.settings(
name := "compilerplugin-shaded",
crossScalaVersions := Seq(Scala210, Scala211, Scala212),
crossScalaVersions := Seq(Scala210, Scala211, Scala212, Scala213),
assemblyShadeRules in assembly := Seq(
ShadeRule.rename("scalapb.options.Scalapb**" -> shadeTarget.value).inProject,
ShadeRule.rename("com.google.**" -> shadeTarget.value).inAll
Expand Down

0 comments on commit 3d87c99

Please sign in to comment.