Skip to content

Commit

Permalink
Add java-debug as a submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
adpi2 committed Oct 28, 2022
1 parent fe3af91 commit fc30c56
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: coursier/[email protected]
with:
app: sbt
Expand All @@ -30,6 +32,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: coursier/[email protected]
with:
jvm: ${{ matrix.jvm }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: coursier/[email protected]
with:
app: sbt
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "modules/java-debug"]
path = modules/java-debug
url = [email protected]:scalacenter/java-debug.git
28 changes: 26 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ inThisBuild(
lazy val root = project
.in(file("."))
.aggregate(
javaDebug,
core212,
tests212,
sbtPlugin,
Expand All @@ -39,10 +40,34 @@ lazy val root = project
publish / skip := true
)

lazy val javaDebug = project
.in(file("modules/java-debug/com.microsoft.java.debug.core"))
.settings(
name := "com-microsoft-java-debug-core",
crossPaths := false,
autoScalaLibrary := false,
libraryDependencies ++= Seq(
"org.apache.commons" % "commons-lang3" % "3.6",
"com.google.code.gson" % "gson" % "2.8.9",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1",
"org.reactivestreams" % "reactive-streams" % "1.0.0",
"commons-io" % "commons-io" % "2.10.0",
"junit" % "junit" % "4.13.1" % Test,
"org.easymock" % "easymock" % "3.4" % Test,
"com.novocode" % "junit-interface" % "0.10" % Test
),
Test / fork := true,
version := "0.34.0+10-SNAPSHOT"
)

lazy val core212 = core.jvm(Dependencies.scala212)
lazy val core = projectMatrix
.in(file("modules/core"))
.jvmPlatform(scalaVersions = Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala32))
.jvmPlatform(
Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala32),
Seq.empty,
p => p.dependsOn(javaDebug)
)
.enablePlugins(SbtJdiTools, BuildInfoPlugin)
.settings(
name := "scala-debug-adapter",
Expand All @@ -51,7 +76,6 @@ lazy val core = projectMatrix
Dependencies.scalaReflect(scalaVersion.value),
Dependencies.asm,
Dependencies.asmUtil,
Dependencies.javaDebug,
Dependencies.sbtTestAgent
),
libraryDependencies += onScalaVersion(
Expand Down
1 change: 1 addition & 0 deletions modules/java-debug
Submodule java-debug added at c4af55
1 change: 0 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ object Dependencies {

val asm = "org.ow2.asm" % "asm" % asmVersion
val asmUtil = "org.ow2.asm" % "asm-util" % asmVersion
val javaDebug = "ch.epfl.scala" % "com-microsoft-java-debug-core" % "0.34.0+9"

def scalaCompiler(scalaVersion: String): ModuleID = {
CrossVersion.partialVersion(scalaVersion) match {
Expand Down

0 comments on commit fc30c56

Please sign in to comment.