Skip to content

Update Scala Native 0.4.0 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
os: linux
language: scala
sudo: required
dist: trusty
dist: bionic
addons:
apt:
update: true

jdk:
- oraclejdk8
- openjdk8

script:
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
- ./mill __.test.run
25 changes: 18 additions & 7 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
import mill._, scalalib._, scalajslib._, scalanativelib._, publish._

val dottyVersions = sys.props.get("dottyVersion").toList

val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-M3" :: dottyVersions
val scala2Versions = scalaVersions.filter(_.startsWith("2."))

val scalaJSVersions = for {
scalaV <- scala2Versions
scalaJSV <- Seq("0.6.33", "1.4.0")
} yield (scalaV, scalaJSV)

val scalaNativeVersions = for {
scalaV <- scala2Versions
scalaNativeV <- Seq("0.4.0")
} yield (scalaV, scalaNativeV)

trait SourcecodeModule extends PublishModule {
def artifactName = "sourcecode"
Expand Down Expand Up @@ -64,8 +78,8 @@ trait SourcecodeTestModule extends ScalaModule {
}

object sourcecode extends Module {
val dottyVersion = Option(sys.props("dottyVersion"))
object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.8", "2.13.0", "3.0.0-M3") ++ dottyVersion): _*)
val dottyVersion = sys.props.get("dottyVersion")
object jvm extends Cross[JvmSourcecodeModule](scalaVersions: _*)
class JvmSourcecodeModule(val crossScalaVersion: String)
extends SourcecodeMainModule with ScalaModule with SourcecodeModule {

Expand All @@ -85,10 +99,7 @@ object sourcecode extends Module {
}
}

object js extends Cross[JsSourcecodeModule](
("2.11.12", "0.6.33"), ("2.12.10", "0.6.33"), ("2.13.1", "0.6.33"),
("2.11.12", "1.0.0"), ("2.12.10", "1.0.0"), ("2.13.1", "1.0.0")
)
object js extends Cross[JsSourcecodeModule](scalaJSVersions: _*)
class JsSourcecodeModule(val crossScalaVersion: String, crossJSVersion: String)
extends SourcecodeMainModule with ScalaJSModule with SourcecodeModule {
def offset = os.up
Expand All @@ -103,7 +114,7 @@ object sourcecode extends Module {
}
}

object native extends Cross[NativeSourcecodeModule](("2.11.12", "0.3.9"), ("2.11.12", "0.4.0-M2"))
object native extends Cross[NativeSourcecodeModule](scalaNativeVersions: _*)
class NativeSourcecodeModule(val crossScalaVersion: String, crossScalaNativeVersion: String)
extends SourcecodeMainModule with ScalaNativeModule with SourcecodeModule {
def offset = os.up
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with MILL_VERSION env variable
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
DEFAULT_MILL_VERSION=0.8.0-13-105f53
DEFAULT_MILL_VERSION=0.9.4-18-82ea87

set -e

Expand Down