Skip to content

Commit

Permalink
Merge pull request #224 from PawelLipski/chore/robot-update
Browse files Browse the repository at this point in the history
Update remote-robot and sbt-idea-plugin
  • Loading branch information
lukaszwawrzyk authored Jul 7, 2022
2 parents 823dc3f + 251fcad commit 40815f2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
8 changes: 6 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ val scala212 = "2.12.16"
val scala213 = "2.13.8"
val crossScalaVersions = List(scala212, scala213)

Global / onChangedBuildSource := ReloadOnSourceChanges

(publish / skip) := true

(ThisBuild / scalaVersion) := scala213
Expand Down Expand Up @@ -112,7 +114,9 @@ lazy val robotDriver = module("robot-driver", "extensions/robot/driver")

lazy val robotDriver213 = robotDriver(scala213)

lazy val driverTests = testModule("driver-tests", "core/driver/tests").cross
lazy val driverTests = testModule("driver-tests", "core/driver/tests")
.settings(libraryDependencies += Dependencies.commonsIO)
.cross
.dependsOn(junitDriver, robotDriver, api % "compile->compile;test->test")

lazy val driverTests213 = driverTests(scala213)
Expand Down Expand Up @@ -258,7 +262,7 @@ lazy val bazelProbeDriver =
module(id = "bazel-probe-driver", path = "extensions/bazel/driver")
.settings(
name := "bazel-probe-driver",
libraryDependencies += "commons-codec" % "commons-codec" % "1.15"
libraryDependencies ++= Seq(Dependencies.commonsCodec, Dependencies.commonsIO)
)
.cross
.dependsOn(bazelProbeApi, driver, robotDriver)
Expand Down
9 changes: 6 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ object Dependencies {
"org.scala-lang" % "scala-library" % version
)

val nuProcess = "com.zaxxer" % "nuprocess" % "2.0.3"
val commonsCodec = "commons-codec" % "commons-codec" % "1.15"
val commonsIO = "commons-io" % "commons-io" % "2.11.0"

val remoteRobot = "com.intellij.remoterobot" % "remote-robot" % "0.11.14"
val nuProcess = "com.zaxxer" % "nuprocess" % "2.0.3"

val remoteRobotFixtures = "com.intellij.remoterobot" % "remote-fixtures" % "0.11.14"
val robotVersion = "0.11.15"
val remoteRobot = "com.intellij.remoterobot" % "remote-robot" % robotVersion
val remoteRobotFixtures = "com.intellij.remoterobot" % "remote-fixtures" % robotVersion

val gson = "com.google.code.gson" % "gson" % "2.9.0"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.1")
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
Expand Down

0 comments on commit 40815f2

Please sign in to comment.