More cleanup

Author: sideeffffect

build.sbt

@@ -15,7 +15,7 @@ lazy val native = project
   .settings(commonSettings)
   .settings(
     name := "scala-rust-interop-native",
-    nativeBuildTool := Cargo(),
+    nativeBuildTool := Cargo.make(),
     nativeCompile / sourceDirectory := baseDirectory.value,
     libraryDependencies ++= List(
     ),
@@ -30,31 +30,15 @@ lazy val core = project
     Compile / mainClass := Some("com.github.sideeffffect.scalarustinterop.Main"),
     scalacOptions --= List("-Xfatal-warnings"),
     libraryDependencies ++= List(
-      //      Dependencies.doobie,
-      //      Dependencies.circe,
-      //      Dependencies.commonsLang,
-      //      Dependencies.emil,
-      //      Dependencies.http4sCirce,
-      //      Dependencies.http4sDsl,
-      //      Dependencies.http4sServer,
-      //      Dependencies.liquibase,
-      //      Dependencies.logback,
-      //      Dependencies.mariadb,
-      //      Dependencies.snakeyaml,
       Dependencies.zio,
-      //      Dependencies.zioCats,
-      //      Dependencies.zioConfig,
-      //      Dependencies.zioConfigMagnolia,
-      //      Dependencies.zioMagic,
       // Test
-      //      Dependencies.testcontainers % Test,
       Dependencies.zioTest % Test,
       Dependencies.zioTestSbt % Test,
     ),
   )
   .dependsOn(native % Runtime)
 
-lazy val commonSettings: List[Def.Setting[_]] = /* DecentScala.decentScalaSettings ++ */ List(
+lazy val commonSettings: List[Def.Setting[_]] = DecentScala.decentScalaSettings ++ List(
   organization := "com.github.sideeffffect",
   homepage := Some(url("https://github.com/sideeffffect/scala-rust-interop")),
   licenses := List("GPLv3" -> url("https://www.gnu.org/licenses/gpl-3.0.en.html")),
@@ -67,22 +51,11 @@ lazy val commonSettings: List[Def.Setting[_]] = /* DecentScala.decentScalaSettin
     ),
   ),
   scalaVersion := crossScalaVersions.value.head,
-  crossScalaVersions := List("2.13.5"),
-//  crossScalaVersions := List(DecentScala.decentScalaVersion213),
-//  ThisBuild / scalafixDependencies ++= List(
-//    Dependencies.zioMagicComments,
-//  ),
+  crossScalaVersions := List(DecentScala.decentScalaVersion213),
   testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
-//  missinglinkExcludedDependencies ++= List(
-//    moduleFilter(organization = "ch.qos.logback", name = "logback-classic"),
-//    moduleFilter(organization = "ch.qos.logback", name = "logback-core"),
-//    moduleFilter(organization = "com.zaxxer", name = "HikariCP"),
-//    moduleFilter(organization = "org.slf4j", name = "slf4j-api"),
-//  ),
-//  mimaReportBinaryIssues := {},
-  // https://github.com/olafurpg/sbt-ci-release/issues/181
-  sonatypeCredentialHost := "s01.oss.sonatype.org",
-  sonatypeRepository := "https://s01.oss.sonatype.org/service/local",
+  missinglinkExcludedDependencies ++= List(
+  ),
+  mimaReportBinaryIssues := {},
 )
 
-addCommandAlias("ci", "; javah; check; +publishLocal")
+addCommandAlias("ci", "; check; +publishLocal")

project/Cargo.scala

@@ -61,5 +61,5 @@ private final class Cargo private (release: Boolean = true) extends BuildTool {
 }
 
 object Cargo {
-  def apply(release: Boolean = true): BuildTool = new Cargo(release)
+  def make(release: Boolean = true): BuildTool = new Cargo(release)
 }

project/Dependencies.scala

@@ -3,50 +3,10 @@ import sbt._
 object Dependencies {
 
   object Versions {
-
-    val doobie = "0.13.1"
-    val circe = "0.13.0"
-    val commonsLang = "3.12.0"
-    val emil = "0.9.1"
-    val http4s = "0.21.22"
-    val liquibase = "4.3.5"
-    val logback = "1.2.3"
-    val mariadb = "2.7.2"
-    val snakeyaml = "1.28"
     val zio = "1.0.7"
-    val zioCats = "2.4.1.0"
-    val zioConfig = "1.0.4"
-    val zioMagic = "0.3.0"
-
-    // Test
-    val testcontainers = "0.39.3"
-
-    // Scalafix plugins
-    val zioMagicComments = "0.1.0"
   }
 
-  val doobie = "org.tpolecat" %% "doobie-hikari" % Versions.doobie
-  val circe = "io.circe" %% "circe-generic" % Versions.circe
-  val commonsLang = "org.apache.commons" % "commons-lang3" % Versions.commonsLang
-  val emil = "com.github.eikek" %% "emil-doobie" % Versions.emil
-  val http4sCirce = "org.http4s" %% "http4s-circe" % Versions.http4s
-  val http4sDsl = "org.http4s" %% "http4s-dsl" % Versions.http4s
-  val http4sServer = "org.http4s" %% "http4s-blaze-server" % Versions.http4s
-  val liquibase = "org.liquibase" % "liquibase-core" % Versions.liquibase
-  val logback = "ch.qos.logback" % "logback-classic" % Versions.logback
-  val mariadb = "org.mariadb.jdbc" % "mariadb-java-client" % Versions.mariadb
-  val snakeyaml = "org.yaml" % "snakeyaml" % Versions.snakeyaml
   val zio = "dev.zio" %% "zio" % Versions.zio
-  val zioCats = "dev.zio" %% "zio-interop-cats" % Versions.zioCats
-  val zioConfig = "dev.zio" %% "zio-config-typesafe" % Versions.zioConfig
-  val zioConfigMagnolia = "dev.zio" %% "zio-config-magnolia" % Versions.zioConfig
-  val zioMagic = "io.github.kitlangton" %% "zio-magic" % Versions.zioMagic
   val zioTest = "dev.zio" %% "zio-test" % Versions.zio
   val zioTestSbt = "dev.zio" %% "zio-test-sbt" % Versions.zio
-
-  // Test
-  val testcontainers = "com.dimafeng" %% "testcontainers-scala-postgresql" % Versions.testcontainers
-
-  // Scalafix plugins
-  val zioMagicComments = "com.timushev" %% "zio-magic-comments" % Versions.zioMagicComments
 }

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.4.1")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
-addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "0.6.7+1-78f64f07")
+addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "0.7.0+1-8662d5e8")