From 0646f756a24caac5bc6c77ec624428161d4348f2 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 7 Mar 2018 22:40:02 -0800 Subject: Compile for Scala 2.13.0-M3 --- build.sbt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 42ada89..8a2a8c3 100644 --- a/build.sbt +++ b/build.sbt @@ -9,11 +9,16 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings(scalaMacroDependencies: _*) .settings(moduleName := "magnolia") .settings( - crossScalaVersions := "2.12.4" :: "2.11.12" :: Nil, scalaVersion := crossScalaVersions.value.head ) + .jvmSettings( + crossScalaVersions := "2.12.4" :: "2.13.0-M3" :: "2.11.12" :: Nil + ) + .jsSettings( + crossScalaVersions := "2.12.4" :: "2.11.12" :: Nil + ) .nativeSettings( - crossScalaVersions := "2.11.12" :: Nil, + crossScalaVersions := "2.11.12" :: Nil ) lazy val coreJVM = core.jvm @@ -25,6 +30,14 @@ lazy val examples = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings(buildSettings: _*) .settings(publishSettings: _*) .settings(moduleName := "magnolia-examples") + .jvmSettings( + crossScalaVersions := (crossScalaVersions in coreJVM).value, + scalaVersion := (scalaVersion in coreJVM).value + ) + .jsSettings( + crossScalaVersions := (crossScalaVersions in coreJS).value, + scalaVersion := (scalaVersion in coreJS).value + ) .nativeSettings( crossScalaVersions := (crossScalaVersions in coreNative).value, scalaVersion := (scalaVersion in coreNative).value @@ -53,7 +66,7 @@ lazy val tests = project .dependsOn(examplesJVM) lazy val root = (project in file(".")) - .aggregate(coreJVM, coreJS, coreNative, examplesJVM, examplesJS, examplesNative) + .aggregate(coreJVM, coreJS, coreNative, examplesJVM, examplesJS, examplesNative, tests) .settings( publish := {}, publishLocal := {} -- cgit v1.2.3