Skip to content

Commit

Permalink
Update to ScalaJS 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thesamet committed Feb 7, 2020
1 parent dad7983 commit 0666e5d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
- Added `bytes_type` file-level options to modify the Scala type generated for
protobuf's `bytes` type (#746).

- Updated to ScalaJS 1.0.0

## [0.9.4](https://github.com/scalapb/ScalaPB/tree/v0.9.5)
[Full Changelog](https://github.com/scalapb/ScalaPB/compare/v0.9.4...v0.9.5)
- Fix a couple of cases of oneof naming conflicts. (#695)
Expand Down
18 changes: 5 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,9 @@ val ScalaTestPlusScalaCheck = "org.scalatestplus" %% "scalacheck-1-14" % "3.1.0.

val ScalaTestPlusMockito = "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0"

val utestVersion = "0.7.3"

val fastparseVersion = Def.setting(
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v <= 11 =>
// drop Scala 2.11 support since 2.1.3
"2.1.2"
case _ =>
"2.1.3"
}
)
val utestVersion = "0.7.4"

val fastparseVersion = "2.2.4"

ThisBuild / scalaVersion := Scala212

Expand Down Expand Up @@ -109,7 +101,7 @@ lazy val runtime = crossProject(JSPlatform, JVMPlatform /*, NativePlatform*/ )
.settings(
name := "scalapb-runtime",
libraryDependencies ++= Seq(
"com.lihaoyi" %%% "fastparse" % fastparseVersion.value,
"com.lihaoyi" %%% "fastparse" % fastparseVersion,
"com.google.protobuf" % "protobuf-java" % protobufVersion % "protobuf",
"com.lihaoyi" %%% "utest" % utestVersion % "test",
"commons-codec" % "commons-codec" % "1.14" % "test",
Expand Down Expand Up @@ -210,7 +202,7 @@ lazy val runtime = crossProject(JSPlatform, JVMPlatform /*, NativePlatform*/ )
.dependsOn(lenses)
.platformsSettings(JSPlatform /*, NativePlatform*/ )(
libraryDependencies ++= Seq(
"com.thesamet.scalapb" %%% "protobuf-runtime-scala" % "0.8.3"
"com.thesamet.scalapb" %%% "protobuf-runtime-scala" % "0.8.4"
),
(Compile / unmanagedSourceDirectories) += baseDirectory.value / ".." / "non-jvm" / "src" / "main" / "scala"
)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.32")
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")

Expand Down

0 comments on commit 0666e5d

Please sign in to comment.