Revert "Merge branch 'staging' into yousif-steensgaard-ctx-sensetive"

This reverts commit 21c1e5b, reversing
changes made to d133b75.

.bsp/mill-bsp.json

@@ -0,0 +1 @@
+{"name":"mill-bsp","argv":["mill", "--bsp","--disable-ticker","--color","false","--jobs","1"],"millVersion":"0.11.6","bspVersion":"2.1.0-M7","languages":["scala","java"]}

.gitignore

@@ -21,6 +21,4 @@ src/main/antlr4/.antlr
 *.so
 examplesold/
 src/test/scala/dump/
-src/test/analysis/dump/
-*.gtirb
-*.json
+src/test/analysis/dump/

build.sbt

@@ -25,20 +25,11 @@ lazy val root = project
     libraryDependencies += scalactic,
     libraryDependencies += scalaTests,
     libraryDependencies += sourceCode,
-    libraryDependencies += mainArgs,
-    libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
+    libraryDependencies += mainArgs
   )
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 
-Compile / PB.targets := Seq(
-  scalapb.gen() -> (Compile / sourceManaged).value / "scalapb"
-)
-libraryDependencies ++= Seq(
-  "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
-)
-libraryDependencies += "io.spray" %% "spray-json" % "1.3.6"
-
 lazy val updateExpected = taskKey[Unit]("updates .expected for test cases")
 
 updateExpected := {

build.sc

@@ -3,12 +3,8 @@ import mill._, mill.define._, scalalib._
 import $file.antlr // https://index.scala-lang.org/ml86/mill-antlr
 
 import os.Path
-import $ivy.`com.lihaoyi::mill-contrib-scalapblib:$MILL_VERSION`
-import contrib.scalapblib._
 
-
-
-object basil extends RootModule with ScalaModule with antlr.AntlrModule with ScalaPBModule{
+object basil extends RootModule with ScalaModule with antlr.AntlrModule {
   def scalaVersion = "3.3.1"
 
   val javaTests = ivy"com.novocode:junit-interface:0.11"
@@ -17,17 +13,12 @@ object basil extends RootModule with ScalaModule with antlr.AntlrModule with Sca
   val antlrRuntime = ivy"org.antlr:antlr4-runtime:4.9"
   val sourceCode = ivy"com.lihaoyi::sourcecode:0.3.0"
   val mainArgs = ivy"com.lihaoyi::mainargs:0.5.1"
-  val sprayJson = ivy"io.spray::spray-json:1.3.6"
-  val scalapb = ivy"com.thesamet.scalapb::scalapb-runtime:0.11.15" 
-
-  def scalaPBVersion = "0.11.15"
-
 
   def mainClass = Some("Main")
 
-  override def scalaPBSources = T.sources {Seq(PathRef(this.millSourcePath / "main" / "protobuf"))}
+
   def millSourcePath = super.millSourcePath / "src"
-  def ivyDeps = Agg(scalactic, antlrRuntime, sourceCode, mainArgs, sprayJson, scalapb)
+  def ivyDeps = Agg(scalactic, antlrRuntime, sourceCode, mainArgs)
   def sources = T.sources {Seq(PathRef(this.millSourcePath / "main" / "scala" ))}
 
 
@@ -65,7 +56,7 @@ object basil extends RootModule with ScalaModule with antlr.AntlrModule with Sca
             if (verified == shouldVerify) {
               if (os.exists(outPath) && !(os.exists(expectedPath) && filesContentEqual(outPath, expectedPath))) {
                 println(s"updated $expectedPath")
-                os.copy.over(outPath, expectedPath)
+                os.copy(outPath, expectedPath)
               }
             }
           }

docker/asli.Dockerfile

@@ -195,5 +195,5 @@ RUN apt-get update && apt-get install --yes default-jre-headless python3 libgmp-
 # ------------------
 # Transplanted BAP 
 # ==================
-COPY --from=basil /basil/target/scala-3.3.0/wptool-boogie-assembly-0.0.1.jar /target/scala-3.3.0/wptool-boogie-assembly-0.0.1.jar
+COPY --from=basil /basil/target/scala-3.1.0/wptool-boogie-assembly-0.0.1.jar /target/scala-3.1.0/wptool-boogie-assembly-0.0.1.jar
 WORKDIR /app