Skip to content

Commit

Permalink
Merge pull request #1 from alexarchambault/master
Browse files Browse the repository at this point in the history
Update app descriptors, bump versions
  • Loading branch information
alexarchambault committed Feb 9, 2020
2 parents 88bcbc5 + 902de34 commit b326fc0
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .travis-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ mkdir -p "$DIR"

export PATH="$DIR:$PATH"

COURSIER_VERSION="2.0.0-RC6-1"
MILL_VERSION="0.3.6"
COURSIER_VERSION="2.0.0-RC6-2"
MILL_VERSION="0.6.0"

if [ ! -x "$DIR/coursier-$COURSIER_VERSION" ]; then
curl -Lo "$DIR/coursier-$COURSIER_VERSION" \
Expand Down
2 changes: 1 addition & 1 deletion apps/resources/ammonite.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"scalaVersion": "2.12.+",
"scalaVersion": "2.13.+",
"mainClass": "ammonite.Main?",
"repositories": [
"central"
Expand Down
33 changes: 0 additions & 33 deletions apps/resources/coursier-graalvm.json

This file was deleted.

13 changes: 13 additions & 0 deletions apps/resources/cs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scalaVersion": "2.12.+",
"repositories": [
"central",
"typesafe:ivy-releases"
],
"launcherType": "graalvm-native-image",
"dependencies": [
"io.get-coursier::coursier-cli:latest.release"
],
"name": "cs",
"prebuilt": "https://github.com/coursier/coursier/releases/download/v${version}/cs-${platform}"
}
2 changes: 1 addition & 1 deletion apps/resources/dotty-repl.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"central"
],
"dependencies": [
"ch.epfl.lamp:dotty-compiler_0.16:latest.stable"
"ch.epfl.lamp:dotty-compiler_0.22:latest.stable"
],
"properties": {
"scala.usejavacp": "true"
Expand Down
2 changes: 1 addition & 1 deletion apps/resources/mdoc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"scalaVersion": "2.12.+",
"scalaVersion": "2.13.+",
"repositories": [
"central"
],
Expand Down
4 changes: 2 additions & 2 deletions apps/resources/scalafmt.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"scalaVersion": "2.11.+",
"scalaVersion": "2.13.+",
"mainClass": "org.scalafmt.cli.Cli?",
"repositories": [
"central"
],
"dependencies": [
"org.scalameta::scalafmt-cli:latest.release"
]
}
}

0 comments on commit b326fc0

Please sign in to comment.