Skip to content

Commit

Permalink
generation/Bloop.scala: use full scala.js version (#71)
Browse files Browse the repository at this point in the history
Bloop: Use full Scala.js version in generated configuration
  • Loading branch information
nafg authored and tindzk committed Dec 17, 2019
1 parent f4df8c3 commit e8f95f9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/main/scala/seed/generation/Bloop.scala
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ object Bloop {
platform = Some(
Config.Platform.Js(
Config.JsConfig(
version =
SemanticVersioning.majorMinorVersion(js.scalaJsVersion.get),
version = js.scalaJsVersion.get,
mode = Config.LinkerMode.Debug,
kind = Config.ModuleKindJS.NoModule,
emitSourceMaps = emitSourceMaps,
Expand Down
5 changes: 5 additions & 0 deletions src/test/scala/seed/generation/BloopIntegrationSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package seed.generation

import java.nio.file.{Files, Path, Paths}

import bloop.config.Config.JsConfig
import bloop.config.ConfigEncoderDecoders
import minitest.TestSuite
import org.apache.commons.io.FileUtils
Expand Down Expand Up @@ -217,6 +218,10 @@ object BloopIntegrationSpec extends TestSuite[Unit] {
.map(getFileName),
List("paradise_2.11.12-2.1.1.jar")
)
assertEquals(
exampleJs.project.platform.get.config.asInstanceOf[JsConfig].version,
"0.6.26"
)

def checkResolutionArtefacts(configFile: bloop.config.Config.File): Unit = {
val resolution = configFile.project.resolution.get.modules
Expand Down

0 comments on commit e8f95f9

Please sign in to comment.