From b665780c39d5aff657ec020d83dea668c735b0b2 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 17 Sep 2018 13:43:36 -0700 Subject: Revert "Move resolver config to from project-level to build-level settings" This reverts commit a9b8f1aff846a486155d947f9dd94c33c682509c. --- src/main/scala/xyz.driver.sbt/LibraryPlugin.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/xyz.driver.sbt/LibraryPlugin.scala b/src/main/scala/xyz.driver.sbt/LibraryPlugin.scala index 95a9a3a..cee085b 100644 --- a/src/main/scala/xyz.driver.sbt/LibraryPlugin.scala +++ b/src/main/scala/xyz.driver.sbt/LibraryPlugin.scala @@ -45,11 +45,11 @@ object LibraryPlugin extends AutoPlugin { ) } - override def buildSettings: Seq[sbt.Setting[_]] = versionSettings ++ repositorySettings ++ Seq( + override def buildSettings: Seq[sbt.Setting[_]] = versionSettings ++ Seq( skip in publish := true ) - override def projectSettings: Seq[Def.Setting[_]] = publicationSettings ++ Seq( + override def projectSettings: Seq[Def.Setting[_]] = repositorySettings ++ publicationSettings ++ Seq( javacOptions ++= Seq("-target", "1.8"), crossScalaVersions := List("2.12.6"), scalaVersion := crossScalaVersions.value.last, -- cgit v1.2.3