Merge pull request sbt#315 from eed3si9n/wip/bintray

Bump to Scala 2.13.5 / 2.12.13

build.sbt

@@ -12,7 +12,6 @@ ThisBuild / version := {
 }
 ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / organization := "org.scala-sbt"
-ThisBuild / bintrayPackage := sys.env.get("BINTRAY_PACKAGE").getOrElse("io")
 ThisBuild / homepage := Some(url("https://github.com/sbt/io"))
 ThisBuild / description := "IO module for sbt"
 ThisBuild / scmInfo := Some(ScmInfo(url("https://github.com/sbt/io"), "git@github.com:sbt/io.git"))
@@ -37,6 +36,11 @@ ThisBuild / developers := List(
   Developer("dwijnand", "Dale Wijnand", "@dwijnand", url("https://github.com/dwijnand")),
 )
 ThisBuild / turbo := true
+ThisBuild / pomIncludeRepository := (_ => false)
+ThisBuild / publishTo := {
+  val nexus = "https://oss.sonatype.org/"
+  Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
 
 def commonSettings: Seq[Setting[_]] = Seq(
   scalaVersion := scala212,
@@ -96,6 +100,7 @@ val io = (project in file("io"))
           "1.1.4",
           "1.2.0",
           "1.3.0",
+          "1.4.0",
         ) map (version => organization.value %% moduleName.value % version)
     }),
     mimaBinaryIssueFilters ++= Seq(

project/Dependencies.scala

@@ -2,8 +2,8 @@ import sbt._
 import Keys._
 
 object Dependencies {
-  val scala212 = "2.12.10"
-  val scala213 = "2.13.1"
+  val scala212 = "2.12.13"
+  val scala213 = "2.13.5"
 
   val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
 

project/HouseRulesPluglin.scala

@@ -2,24 +2,14 @@ package iobuild
 
 import sbt._
 import Keys._
-import bintray.BintrayPlugin
-import bintray.BintrayPlugin.autoImport._
 
 object HouseRulesPlugin extends AutoPlugin {
-  override def requires = plugins.JvmPlugin && BintrayPlugin
+  override def requires = plugins.JvmPlugin
   override def trigger = allRequirements
 
-  override def buildSettings: Seq[Def.Setting[_]] = baseBuildSettings
   override def projectSettings: Seq[Def.Setting[_]] = baseSettings
 
-  lazy val baseBuildSettings: Seq[Def.Setting[_]] = Seq(
-    bintrayOrganization := Some("sbt"),
-    bintrayRepository := sys.env.get("BINTRAY_REPOSITORY").getOrElse("maven-releases"),
-  )
-
   lazy val baseSettings: Seq[Def.Setting[_]] = Seq(
-    bintrayPackage := (ThisBuild / bintrayPackage).value,
-    bintrayRepository := (ThisBuild / bintrayRepository).value,
     scalacOptions ++= Seq("-encoding", "utf8"),
     scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlint"),
     scalacOptions += "-language:higherKinds",

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.4
+sbt.version=1.4.9

project/plugins.sbt

@@ -1,9 +1,8 @@
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.1")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
 addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.1.0")
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.0")