d10xa · d10xa · Feb 4, 2020 · Feb 2, 2020 · Feb 2, 2020 · Feb 3, 2020
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ name := "jadd"
 organization in ThisBuild := "ru.d10xa"
 
 scalaVersion in ThisBuild := "2.13.1"
-version in ThisBuild := IO.read(new File("VERSION")).trim
+version in ThisBuild := IO.read(file("VERSION")).trim
 mainClass in Compile := Some("ru.d10xa.jadd.Jadd")
 
 lazy val root = project
@@ -16,11 +16,15 @@ lazy val root = project
       "-feature", // warn about misused language features
       "-language:higherKinds", // allow higher kinded types without `import scala.language.higherKinds`
       "-Xlint", // enable handy linter warnings
-      "-Xfatal-warnings" // turn compiler warnings into errors
+      "-Xfatal-warnings", // turn compiler warnings into errors,
+      "-Ymacro-annotations" // for @newtype
     )
   )
 
 enablePlugins(JavaAppPackaging)
+
+addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.0" cross CrossVersion.full)
+
 //wartremoverErrors ++= Warts.unsafe
 wartremoverErrors in (Compile, compile) ++= Seq(
 //  Wart.Any,
@@ -63,3 +67,5 @@ libraryDependencies += "org.typelevel" %% "cats-effect" % "2.1.0"
 libraryDependencies += "com.github.pathikrit" %% "better-files" % "3.8.0"
 libraryDependencies += "io.get-coursier" %% "coursier-core" % "2.0.0-RC5-6"
 libraryDependencies += "org.antlr" % "antlr4-runtime" % "4.8"
+libraryDependencies += "io.estatico" %% "newtype" % "0.4.3"
+//libraryDependencies += "eu.timepit" %% "refined" % "0.9.12"
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,4 +2,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.6.1")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.3")
+
 ///https://dl.bintray.com/sbt/sbt-plugin-releases/com.typesafe.sbt/sbt-native-packager/scala_2.12/sbt_1.0/
diff --git a/src/main/scala/ru/d10xa/jadd/cli/Cli.scala b/src/main/scala/ru/d10xa/jadd/cli/Cli.scala
@@ -5,7 +5,7 @@ import ru.d10xa.jadd.cli.Command.Install
 import ru.d10xa.jadd.cli.Command.Search
 import ru.d10xa.jadd.cli.Command.Show
 import ru.d10xa.jadd.core.Ctx
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.show.JaddFormatShowPrinter
 import ru.d10xa.jadd.show.ShowPrinter
 import scopt.OptionDef

diff --git a/src/main/scala/ru/d10xa/jadd/cli/Config.scala b/src/main/scala/ru/d10xa/jadd/cli/Config.scala
@@ -1,7 +1,7 @@
 package ru.d10xa.jadd.cli
 
 import ru.d10xa.jadd.cli.Command.Repl
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.repository.RepositoryConstants
 import ru.d10xa.jadd.show.JaddFormatShowPrinter
 import ru.d10xa.jadd.show.ShowPrinter

diff --git a/src/main/scala/ru/d10xa/jadd/code/inserts/SbtArtifactMatcher.scala b/src/main/scala/ru/d10xa/jadd/code/inserts/SbtArtifactMatcher.scala
@@ -3,7 +3,7 @@ package ru.d10xa.jadd.code.inserts
 import cats.implicits._
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.CodeBlock
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.view.ArtifactView.Match
 
 import scala.util.matching.Regex

diff --git a/src/main/scala/ru/d10xa/jadd/core/Artifact.scala b/src/main/scala/ru/d10xa/jadd/core/Artifact.scala
@@ -4,6 +4,8 @@ import cats.Show
 import cats.implicits._
 import com.typesafe.scalalogging.StrictLogging
 import coursier.core.Version
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.repository.MavenMetadata
 import ru.d10xa.jadd.show.JaddFormatShowPrinter
 import troubles.ArtifactTrouble
@@ -86,22 +88,6 @@ final case class Artifact(
 
 }
 
-final case class GroupId(val value: String) extends AnyVal {
-  def path: String = value.replace('.', '/')
-}
-
-final case class ScalaVersion(val version: Version) extends AnyVal
-
-object ScalaVersion {
-  def fromString(str: String): ScalaVersion = ScalaVersion(Version(str))
-  implicit val showScalaVersion: Show[ScalaVersion] =
-    Show[ScalaVersion](_.version.repr)
-}
-
-object GroupId {
-  implicit val showGroupId: Show[GroupId] = Show[GroupId](_.value.toString)
-}
-
 object Artifact {
 
   implicit val showArtifact: Show[Artifact] = (t: Artifact) =>

diff --git a/src/main/scala/ru/d10xa/jadd/core/ProjectMeta.scala b/src/main/scala/ru/d10xa/jadd/core/ProjectMeta.scala
@@ -1,3 +1,5 @@
 package ru.d10xa.jadd.core
 
+import ru.d10xa.jadd.core.types.ScalaVersion
+
 final case class ProjectMeta(scalaVersion: Option[ScalaVersion])
diff --git a/src/main/scala/ru/d10xa/jadd/core/types.scala b/src/main/scala/ru/d10xa/jadd/core/types.scala
@@ -0,0 +1,35 @@
+package ru.d10xa.jadd.core
+
+import cats.Show
+import coursier.core.Version
+import io.estatico.newtype.macros.newtype
+
+import scala.language.implicitConversions
+
+/**
+  * Warnings disabled because of @newtype
+  */
+@SuppressWarnings(
+  Array(
+    "org.wartremover.warts.FinalCaseClass",
+    "org.wartremover.warts.ImplicitParameter",
+    "org.wartremover.warts.PublicInference",
+    "org.wartremover.warts.ImplicitConversion"
+  ))
+object types {
+
+  @newtype case class GroupId(value: String) {
+    def path: String =
+      value.replace('.', '/') //refineMV(value.value.replace('.', '/'))
+  }
+  object GroupId {
+    implicit val showGroupId: Show[GroupId] = Show[GroupId](_.value.toString)
+  }
+
+  @newtype case class ScalaVersion(version: Version)
+  object ScalaVersion {
+    def fromString(str: String): ScalaVersion = ScalaVersion(Version(str))
+    implicit val showScalaVersion: Show[ScalaVersion] =
+      Show[ScalaVersion](_.version.repr)
+  }
+}
diff --git a/src/main/scala/ru/d10xa/jadd/pipelines/AmmonitePipeline.scala b/src/main/scala/ru/d10xa/jadd/pipelines/AmmonitePipeline.scala
@@ -8,7 +8,7 @@ import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.Ctx
 import ru.d10xa.jadd.core.ProjectFileReader
 import ru.d10xa.jadd.core.SafeFileWriter
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.show.AmmoniteFormatShowPrinter
 import ru.d10xa.jadd.versions.ScalaVersions
 

diff --git a/src/main/scala/ru/d10xa/jadd/pipelines/GradlePipeline.scala b/src/main/scala/ru/d10xa/jadd/pipelines/GradlePipeline.scala
@@ -7,7 +7,7 @@ import com.typesafe.scalalogging.StrictLogging
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.Ctx
 import ru.d10xa.jadd.core.SafeFileWriter
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.code.inserts.GradleFileInserts
 import ru.d10xa.jadd.shortcuts.ArtifactInfoFinder
 import ru.d10xa.jadd.show.GradleShowCommand

diff --git a/src/main/scala/ru/d10xa/jadd/pipelines/MavenPipeline.scala b/src/main/scala/ru/d10xa/jadd/pipelines/MavenPipeline.scala
@@ -9,7 +9,7 @@ import ru.d10xa.jadd.code.Indentation
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.Ctx
 import ru.d10xa.jadd.core.SafeFileWriter
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.code.inserts.MavenFileInserts
 import ru.d10xa.jadd.shortcuts.ArtifactInfoFinder
 import ru.d10xa.jadd.show.MavenFormatShowPrinter

diff --git a/src/main/scala/ru/d10xa/jadd/pipelines/Pipeline.scala b/src/main/scala/ru/d10xa/jadd/pipelines/Pipeline.scala
@@ -14,7 +14,7 @@ import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.Ctx
 import ru.d10xa.jadd.core.Loader
 import ru.d10xa.jadd.core.ProjectMeta
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.core.Utils
 import ru.d10xa.jadd.core.troubles
 import ru.d10xa.jadd.core.troubles.ArtifactTrouble

diff --git a/src/main/scala/ru/d10xa/jadd/pipelines/SbtPipeline.scala b/src/main/scala/ru/d10xa/jadd/pipelines/SbtPipeline.scala
@@ -8,7 +8,7 @@ import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.Ctx
 import ru.d10xa.jadd.core.ProjectFileReader
 import ru.d10xa.jadd.core.SafeFileWriter
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.code.inserts.SbtFileInserts
 import ru.d10xa.jadd.shortcuts.ArtifactInfoFinder
 import ru.d10xa.jadd.show.SbtShowCommand

diff --git a/src/main/scala/ru/d10xa/jadd/pipelines/UnknownProjectPipeline.scala b/src/main/scala/ru/d10xa/jadd/pipelines/UnknownProjectPipeline.scala
@@ -5,7 +5,7 @@ import cats.implicits._
 import com.typesafe.scalalogging.StrictLogging
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.Ctx
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.shortcuts.ArtifactInfoFinder
 import ru.d10xa.jadd.versions.ScalaVersions
 

diff --git a/src/main/scala/ru/d10xa/jadd/repository/MavenMetadata.scala b/src/main/scala/ru/d10xa/jadd/repository/MavenMetadata.scala
@@ -3,7 +3,7 @@ package ru.d10xa.jadd.repository
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.xml.MavenMetadataVersionsRawReader
 
 import scala.util.Try

diff --git a/src/main/scala/ru/d10xa/jadd/shortcuts/ArtifactInfoFinder.scala b/src/main/scala/ru/d10xa/jadd/shortcuts/ArtifactInfoFinder.scala
@@ -4,10 +4,10 @@ import cats.effect.Sync
 import cats.implicits._
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.ArtifactInfo
-import ru.d10xa.jadd.core.GroupId
 import ru.d10xa.jadd.core.Scope
 import ru.d10xa.jadd.core.Utils
 import ru.d10xa.jadd.core.troubles
+import ru.d10xa.jadd.core.types.GroupId
 
 import scala.util.Try
 

diff --git a/src/main/scala/ru/d10xa/jadd/show/MavenShowCommand.scala b/src/main/scala/ru/d10xa/jadd/show/MavenShowCommand.scala
@@ -3,7 +3,7 @@ package ru.d10xa.jadd.show
 import com.typesafe.scalalogging.StrictLogging
 import coursier.core.Version
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
+import ru.d10xa.jadd.core.types.GroupId
 
 import scala.xml.Node
 import scala.xml.XML

diff --git a/src/main/scala/ru/d10xa/jadd/show/SbtShowCommand.scala b/src/main/scala/ru/d10xa/jadd/show/SbtShowCommand.scala
@@ -8,9 +8,9 @@ import ru.d10xa.jadd.core
 import ru.d10xa.jadd.cli.Config
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.CodeBlock
-import ru.d10xa.jadd.core.GroupId
+import ru.d10xa.jadd.core.types.GroupId
 import ru.d10xa.jadd.core.ProjectFileReader
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.core.Scope
 import ru.d10xa.jadd.generated.antlr.SbtDependenciesBaseVisitor
 import ru.d10xa.jadd.generated.antlr.SbtDependenciesLexer

diff --git a/src/main/scala/ru/d10xa/jadd/versions/ScalaVersions.scala b/src/main/scala/ru/d10xa/jadd/versions/ScalaVersions.scala
@@ -1,7 +1,7 @@
 package ru.d10xa.jadd.versions
 
 import cats.data.NonEmptyList
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 
 object ScalaVersions {
   val supportedMinorVersions: NonEmptyList[ScalaVersion] =

diff --git a/src/test/scala/ru/d10xa/jadd/ArtifactInfoFinderTest.scala b/src/test/scala/ru/d10xa/jadd/ArtifactInfoFinderTest.scala
@@ -11,8 +11,8 @@ import ru.d10xa.jadd.core.troubles.ArtifactTrouble
 import cats.implicits._
 import ru.d10xa.jadd.core.Artifact
 import ru.d10xa.jadd.core.ArtifactInfo
-import ru.d10xa.jadd.core.GroupId
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.core.Scope
 
 class ArtifactInfoFinderTest extends TestBase {

diff --git a/src/test/scala/ru/d10xa/jadd/ArtifactTest.scala b/src/test/scala/ru/d10xa/jadd/ArtifactTest.scala
@@ -6,8 +6,8 @@ import ru.d10xa.jadd.testkit.TestBase
 import ru.d10xa.jadd.core.troubles.WrongArtifactRaw
 import cats.implicits._
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 
 class ArtifactTest extends TestBase {
 

diff --git a/src/test/scala/ru/d10xa/jadd/GradleArtifactProviderTest.scala b/src/test/scala/ru/d10xa/jadd/GradleArtifactProviderTest.scala
@@ -4,8 +4,8 @@ import coursier.core.Version
 import ru.d10xa.jadd.core.ArtifactProvider
 import ru.d10xa.jadd.core.ArtifactProvider.GradleBuildDescription
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.testkit.TestBase
 
 class GradleArtifactProviderTest extends TestBase {

diff --git a/src/test/scala/ru/d10xa/jadd/code/inserts/SbtArtifactMatcherTest.scala b/src/test/scala/ru/d10xa/jadd/code/inserts/SbtArtifactMatcherTest.scala
@@ -1,7 +1,7 @@
 package ru.d10xa.jadd.code.inserts
 
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
+import ru.d10xa.jadd.core.types.GroupId
 import ru.d10xa.jadd.testkit.TestBase
 import ru.d10xa.jadd.view.ArtifactView
 import ru.d10xa.jadd.view.ArtifactView.MatchImpl

diff --git a/src/test/scala/ru/d10xa/jadd/code/inserts/SbtFileInsertsTest.scala b/src/test/scala/ru/d10xa/jadd/code/inserts/SbtFileInsertsTest.scala
@@ -2,8 +2,8 @@ package ru.d10xa.jadd.code.inserts
 
 import coursier.core.Version
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.testkit.TestBase
 
 class SbtFileInsertsTest extends TestBase {

diff --git a/src/test/scala/ru/d10xa/jadd/it/MavenRemoteMetadataRepositoryApiTest.scala b/src/test/scala/ru/d10xa/jadd/it/MavenRemoteMetadataRepositoryApiTest.scala
@@ -1,8 +1,8 @@
 package ru.d10xa.jadd.it
 
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.repository.MavenRemoteMetadataRepositoryApi
 import ru.d10xa.jadd.testkit.WireMockTestBase
 

diff --git a/src/test/scala/ru/d10xa/jadd/pipelines/SbtPipelineTest.scala b/src/test/scala/ru/d10xa/jadd/pipelines/SbtPipelineTest.scala
@@ -1,6 +1,6 @@
 package ru.d10xa.jadd.pipelines
 
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.testkit.TestBase
 
 class SbtPipelineTest extends TestBase {

diff --git a/src/test/scala/ru/d10xa/jadd/testkit/TestBase.scala b/src/test/scala/ru/d10xa/jadd/testkit/TestBase.scala
@@ -3,7 +3,7 @@ package ru.d10xa.jadd.testkit
 import org.scalatest.funsuite.AnyFunSuiteLike
 import org.scalatest.matchers.should.Matchers
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.ScalaVersion
 
 abstract class TestBase extends AnyFunSuiteLike with Matchers {
   implicit class ArtifactImplicits(private val artifact: Artifact) {

diff --git a/src/test/scala/ru/d10xa/jadd/versions/ArtifactVersionsDownloaderTest.scala b/src/test/scala/ru/d10xa/jadd/versions/ArtifactVersionsDownloaderTest.scala
@@ -3,7 +3,7 @@ package ru.d10xa.jadd.versions
 import cats.implicits._
 import coursier.core.Version
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
+import ru.d10xa.jadd.core.types.GroupId
 import ru.d10xa.jadd.testkit.TestBase
 
 class ArtifactVersionsDownloaderTest extends TestBase {

diff --git a/src/test/scala/ru/d10xa/jadd/view/ArtifactViewTest.scala b/src/test/scala/ru/d10xa/jadd/view/ArtifactViewTest.scala
@@ -1,8 +1,8 @@
 package ru.d10xa.jadd.view
 
 import ru.d10xa.jadd.core.Artifact
-import ru.d10xa.jadd.core.GroupId
-import ru.d10xa.jadd.core.ScalaVersion
+import ru.d10xa.jadd.core.types.GroupId
+import ru.d10xa.jadd.core.types.ScalaVersion
 import ru.d10xa.jadd.code.inserts.SbtArtifactMatcher
 import ru.d10xa.jadd.testkit.TestBase
 import ru.d10xa.jadd.view.ArtifactView.Match