Skip to content

Commit c4afb82

Browse files
authored
Merge pull request #88 from lolgab/scala-native
Add support for Scala Native 0.3.9 and 0.4.0-M2
2 parents edeb6bf + 87b0c84 commit c4afb82

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ jdk:
99
- oraclejdk8
1010

1111
script:
12-
- curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.4.0/0.4.0-12-102ddf && chmod +x ~/bin/mill
1312
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
14-
- export PATH=~/bin/mill:$PATH
1513
- ./mill __.test.run

build.sc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ object sourcecode extends Module {
101101
val crossScalaVersion = JsSourcecodeModule.this.crossScalaVersion
102102
}
103103
}
104-
/*
105-
object native extends Cross[NativeSourcecodeModule](("2.11.12", "0.3.8")/*, ("2.11.12", "0.4.0-M2")*/)
104+
105+
object native extends Cross[NativeSourcecodeModule](("2.11.12", "0.3.9"), ("2.11.12", "0.4.0-M2"))
106106
class NativeSourcecodeModule(val crossScalaVersion: String, crossScalaNativeVersion: String)
107107
extends SourcecodeMainModule with ScalaNativeModule with SourcecodeModule {
108108
def offset = os.up
@@ -116,5 +116,5 @@ object sourcecode extends Module {
116116
def moduleDeps = Seq(NativeSourcecodeModule.this)
117117
val crossScalaVersion = NativeSourcecodeModule.this.crossScalaVersion
118118
}
119-
}*/
119+
}
120120
}

mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This is a wrapper script, that automatically download mill from GitHub release pages
44
# You can give the required mill version with MILL_VERSION env variable
55
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
6-
DEFAULT_MILL_VERSION=0.6.0-15-ee0405
6+
DEFAULT_MILL_VERSION=0.6.0-21-93fc8e
77

88
set -e
99

0 commit comments

Comments
 (0)