Skip to content

Commit

Permalink
Remove commands to make the plugin compile
Browse files Browse the repository at this point in the history
Signed-off-by: reidspencer <reid.spencer@yoppworks.com>
  • Loading branch information
reid-spencer committed Sep 29, 2023
1 parent 2d8f620 commit 6f63f48
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ object RiddlSbtPlugin extends AutoPlugin {
riddlcConf := file("src/main/riddl/riddlc.conf"),
riddlcJvmHeapSize := 512,
riddlcMinVersion := SbtRiddlPluginBuildInfo.version,
commands ++= Seq(riddlcCommand, infoCommand),
// commands ++= Seq(riddlcCommand, infoCommand),
runRiddlcTask := {
val s: TaskStreams = streams.value
val classPath = (Runtime / fullClasspath).value
Expand Down Expand Up @@ -106,6 +106,7 @@ object RiddlSbtPlugin extends AutoPlugin {
}.value
)

/*
// Allow riddlc to be run from inside an sbt shell
private def riddlcCommand: Command = {
Command.args(
Expand All @@ -132,9 +133,11 @@ object RiddlSbtPlugin extends AutoPlugin {
name = "info",
display = "prints out riddlc info"
) { (state, _) =>
import state._
val s: TaskStreams = streams.value
val project = Project.extract(state)
val classPath = project.get(Runtime / fullClasspath).value
val extracted = Project.extract(state)
import extracted._
val classPath = currentRef.get(Runtime / fullClasspath).value
val minimumVersion = project.get(riddlcMinVersion)
val conf = riddlcConf.value.getAbsoluteFile.toString
val options = riddlcOptions.value
Expand All @@ -145,7 +148,7 @@ object RiddlSbtPlugin extends AutoPlugin {
}

*/
/**
* Convert the given command string to a release step action, preserving and invoking remaining commands
* Note: This was copied from https://github.com/sbt/sbt-release/blob/663cfd426361484228a21a1244b2e6b0f7656bdf/src/main/scala/ReleasePlugin.scala#L99-L115
Expand Down
1 change: 0 additions & 1 deletion sbt-riddl/src/sbt-test/sbt-riddl/simple/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ lazy val root = (project in file("."))
version := "0.1",
riddlcOptions := Seq.empty[String],
riddlcConf := file("src/main/riddl/riddlc.conf"),
riddlcPath := file("/Users/reid/Code/reactific/riddl/riddlc/target/universal/stage/bin/riddlc"),
TaskKey[String]("checkInfoOutput") := {
val which_cmd = Process("/bin/zsh", Seq("-c", "which riddlc"))
val riddlc_path: String = {
Expand Down

0 comments on commit 6f63f48

Please sign in to comment.