Bump Scala, spire versions; clean up build

Author: EmergentOrder

build.sbt

@@ -1,14 +1,13 @@
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
 //val dottyVersion = dottyLatestNightlyBuild.get
-val dottyVersion     = "3.1.0-RC3"
-val spireVersion     = "0.17.0"
+val dottyVersion     = "3.1.0"
+val spireVersion     = "0.18.0-M1"
 val scalaTestVersion = "3.2.10"
 
 scalaVersion := dottyVersion
 
 lazy val commonSettings = Seq(
-//  scalaJSUseMainModuleInitializer := true, //Test only
   organization := "org.emergentorder.onnx",
   version      := "0.15.0",
   scalaVersion := dottyVersion,
@@ -17,7 +16,6 @@ lazy val commonSettings = Seq(
   updateOptions := updateOptions.value.withLatestSnapshots(false),
   scalacOptions ++= Seq("-feature", "-unchecked", "-deprecation"),
   autoCompilerPlugins := true
-//  sources in (Compile, doc) := Seq(), //Bug w/ Dotty & JS on doc
 ) ++ sonatypeSettings
 
 lazy val common = (crossProject(JSPlatform, JVMPlatform)
@@ -51,16 +49,9 @@ lazy val proto = (crossProject(JSPlatform, JVMPlatform)
 lazy val backends = (crossProject(JVMPlatform, JSPlatform)
    .crossType(CrossType.Pure) in file("backends"))
    .dependsOn(core)
-//conditionally enabling/disable based on version, still not working
-//  .enablePlugins(ScalablyTypedConverterPlugin)
    .settings(
      commonSettings,
      name := "onnx-scala-backends",
-//     excludeFilter in unmanagedSources := (CrossVersion
-//        .partialVersion(scalaVersion.value) match {
-//          case _ => "Main.scala" | "ONNXJSOperatorBackend.scala"
-//     }),
-//    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
      libraryDependencies ++= Seq(
        "com.microsoft.onnxruntime" % "onnxruntime" % "1.9.0"
      ),
@@ -72,11 +63,8 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
    )
    .jsSettings(scalaJSUseMainModuleInitializer := true, //, //Testing
 npmDependencies in Compile += "onnxruntime-web" -> "1.9.0")
-//Seems to be a bundling issue, copying things manually seems to work
-//TODO NEW: try JS, bundler and converter beta/RC are out
-//     npmDependencies in Compile += "onnxjs" -> "0.1.8")
 .jsConfigure { project => project.enablePlugins(ScalablyTypedConverterPlugin)}
-//ScalaJSBundlerPlugin)} //,ScalablyTypedConverterPlugin) }
+
 
 lazy val core = (crossProject(JSPlatform, JVMPlatform)
    .crossType(CrossType.Pure) in file("core"))
@@ -85,15 +73,14 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
    .settings(
      commonSettings,
      name := "onnx-scala",
-//    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil }, 
      crossScalaVersions := Seq(
        dottyVersion
      ),
      libraryDependencies ++= (CrossVersion
         .partialVersion(scalaVersion.value) match {
         case _ =>
            Seq(
-             ("org.typelevel" %%% "spire" % spireVersion).cross(CrossVersion.for3Use2_13)
+             ("org.typelevel" %%% "spire" % spireVersion)
            )
      })
    )