Fixed sonatype plugin. Standardise versioning for all modules. Make c…

…ore as root module.

.gitignore

@@ -143,4 +143,5 @@ fabric.properties
 .idea/httpRequests
 
 # Project Specific
-.idea
+/.idea
+/sonatype.sbt

README.md

@@ -2,20 +2,20 @@
 
 ## Concise and typesafe annotation constants for suppressing warnings from [WartRemover](https://github.com/wartremover/wartremover)
 
+|Suppressor|WartRemover|Contrib|
+|----------|-----------|-------|
+|0.1.0     |2.7.3      |1.2.4  |
+
+
 ### SBT Setup
 If only the standard `Warts` are required:
 ```scala
-libraryDependencies += "io.github.yangzai" %% "wartremover-suppressor-core" % "2.3.7-SNAPSHOT"
-```
-
-If only the `ContribWarts` are required:
-```scala
-libraryDependencies += "io.github.yangzai" %% "wartremover-suppressor-contrib" % "1.2.4-SNAPSHOT"
+libraryDependencies += "io.github.yangzai" %% "wartremover-suppressor" % "0.1.0"
 ```
 
-Otherwise, if both are required:
+If `ContribWarts` are also required:
 ```scala
-libraryDependencies += "io.github.yangzai" %% "wartremover-suppressor" % "0.1.0-SNAPSHOT"
+libraryDependencies += "io.github.yangzai" %% "wartremover-suppressor-contrib" % "0.1.0"
 ```
 
 ### Example

build.sbt

@@ -1,23 +1,22 @@
 ThisBuild / organization := "io.github.yangzai"
+ThisBuild / version := "0.1.0-SNAPSHOT"
+
 ThisBuild / scalaVersion := "2.12.8"
-ThisBuild / crossScalaVersions := Seq(scalaVersion.value, "2.11.12")
+ThisBuild / crossScalaVersions += "2.11.12"
 
 ThisBuild / wartremoverErrors ++= Warts.all
 
 lazy val core = project in file("suppressor-core") settings(
-  name := "wartremover-suppressor-core",
-  version := "2.3.7-SNAPSHOT"
+  name := "wartremover-suppressor-core"
 )
 
 lazy val contrib = project in file("suppressor-contrib") dependsOn core settings(
-  name := "wartremover-suppressor-contrib",
-  version := "1.2.4-SNAPSHOT"
+  name := "wartremover-suppressor-contrib"
 )
 
-lazy val root = project in file(".") dependsOn(core, contrib) enablePlugins SbtOsgi settings(
-  name := "wartremover-suppressor",
-  version := "0.1.0-SNAPSHOT",
-  osgiSettings,
-  OsgiKeys.exportPackage := Seq("org.wartremover.suppressor.*;-split-package:=merge-first"),
-  OsgiKeys.privatePackage := Seq.empty
+lazy val root = project in file(".") aggregate(core, contrib) dependsOn core settings(
+  name := "wartremover-suppressor"
 )
+
+useGpg := true
+ThisBuild / publishTo := sonatypePublishTo.value

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.3.7")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")

sonatype.sbt.sample

@@ -0,0 +1,6 @@
+publishMavenStyle := true
+
+licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
+
+import xerial.sbt.Sonatype._
+sonatypeProjectHosting := ???

suppressor-core/src/main/scala/org/wartremover/suppressor/Wart.scala

@@ -14,7 +14,7 @@ object Wart {
   final val Equals = prefix + "Equals"
   final val ExplicitImplicitTypes = prefix + "ExplicitImplicitTypes"
   final val FinalCaseClass = prefix + "FinalCaseClass"
-  final val FinalVal = prefix + "FinalVal"
+  final val FinalVal = "org.wartremover.warts.FinalVal" //used in current module
   final val ForbidInference = prefix + "ForbidInference"
   final val ImplicitConversion = prefix + "ImplicitConversion"
   final val ImplicitParameter = prefix + "ImplicitParameter"