Skip to content
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.

Sign up for GitHub

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

added and tested assembly #14

Merged
merged 3 commits into from
Apr 28, 2021
Merged

added and tested assembly #14

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1211a5
added and tested assembly
MeerKatDev Apr 23, 2021
bbd223a
updated run.sh
MeerKatDev Apr 23, 2021
44b544f
Use pre-compiled test runner assembly
ErikSchierboom Apr 28, 2021
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
4 changes: 3 additions & 1 deletion bin/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ mv -f "${original_tests_file}" "${tests_file}"
popd > /dev/null

# Write the results.json file
sbt "set offline := true" "run ${build_log_file} ${tests_results_file} ${results_file}" > "${runner_log_file}"
# sbt "set offline := true"

java -jar "target/scala-2.13/TestRunner-assembly-0.1.0-SNAPSHOT.jar ${build_log_file} ${tests_results_file} ${results_file}" > "${runner_log_file}"

echo "${slug}: done"
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Dependencies._

ThisBuild / scalaVersion := "2.12.8"
ThisBuild / scalaVersion := "2.13.5"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be the same version the exercises use, so I've reverted this.

ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / organization := "org.exercism"
ThisBuild / organizationName := "exercism"
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sbt._

object Dependencies {
lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1"
lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be the same version the exercises use, so I've reverted this.

}
1 change: 1 addition & 0 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")