From bf6372873928e58c7aa336382f0aa2cd53e42bb9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 16 Mar 2022 13:01:14 +0300 Subject: [PATCH] chore: update sbt version (#9) Co-authored-by: i.akhaltsev --- build.sbt | 4 +++- publish.sbt | 13 +++++++------ .../tinkoff/load/avro/SchemaDownloaderPlugin.scala | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 8b5c80d..df19df4 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,9 @@ lazy val sbtSchemaRegistryPlugin = (project in file(".")) .enablePlugins(SbtPlugin, GitVersioning) .settings( name := "sbt-schema-registry-plugin", - pluginCrossBuild / sbtVersion := "1.3.0", + scalaVersion := "2.12.15", + sbtPlugin := true, + pluginCrossBuild / sbtVersion := "1.6.2", resolvers ++= Seq("Confluent" at "https://packages.confluent.io/maven/"), libraryDependencies ++= Seq(schemaRegistryClient), scriptedLaunchOpts ++= Seq( diff --git a/publish.sbt b/publish.sbt index aff6b93..e1a9683 100644 --- a/publish.sbt +++ b/publish.sbt @@ -1,13 +1,14 @@ -ThisBuild / versionScheme := Some("semver-spec") -ThisBuild / organization := "ru.tinkoff" -ThisBuild / scmInfo := Some( +ThisBuild / versionScheme := Some("semver-spec") +ThisBuild / organization := "ru.tinkoff" +ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org" +ThisBuild / scmInfo := Some( ScmInfo( url("https://github.com/Tinkoff/sbt-schema-registry-plugin"), "git@github.com:Tinkoff/sbt-schema-registry-plugin.git", ), ) -ThisBuild / developers := List( +ThisBuild / developers := List( Developer( id = "red-bashmak", name = "Vyacheslav Kalyokin", @@ -16,6 +17,6 @@ ThisBuild / developers := List( ), ) -ThisBuild / description := "Sbt plugin for download schemas from schema registry" ThisBuild / licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")) -ThisBuild / homepage := Some(url("https://github.com/Tinkoff/sbt-schema-registry-pluginn")) +ThisBuild / description := "Sbt plugin for download schemas from schema registry" +ThisBuild / homepage := Some(url("https://github.com/Tinkoff/sbt-schema-registry-pluginn")) diff --git a/src/main/scala/ru/tinkoff/load/avro/SchemaDownloaderPlugin.scala b/src/main/scala/ru/tinkoff/load/avro/SchemaDownloaderPlugin.scala index b913438..7604ff8 100644 --- a/src/main/scala/ru/tinkoff/load/avro/SchemaDownloaderPlugin.scala +++ b/src/main/scala/ru/tinkoff/load/avro/SchemaDownloaderPlugin.scala @@ -24,8 +24,8 @@ object SchemaDownloaderPlugin extends AutoPlugin { import autoImport.* override lazy val projectSettings: Seq[Setting[?]] = defaultSettings ++ Seq( - logLevel in schemaRegistryDownload := (logLevel ?? Level.Info).value, - schemaRegistryDownload in Compile := { + logLevel / schemaRegistryDownload := (logLevel ?? Level.Info).value, + Compile / schemaRegistryDownload := { val logger = streams.value.log logger.debug(s"schemaRegistryUrl: ${schemaRegistryUrl.value}") logger.debug(s"schemaRegistryTargetFolder: ${schemaRegistryTargetFolder.value}")