From 0fc30e5cb7129e2f30287a1f71db67f027772887 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Thu, 7 Nov 2019 20:59:40 -0500 Subject: [PATCH] Update Sonatype publishing configuration --- .travis.yml | 4 ++-- build.sbt | 7 ------- project/build.properties | 18 +++++++++++++++++- project/sbt-sonatype.sbt | 2 +- sonatype.sbt | 22 ++++++++++------------ 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b9360f..8c68702 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ sudo: false language: scala scala: -- 2.12.8 + - 2.12.10 jdk: - - oraclejdk8 + - openjdk11 install: true diff --git a/build.sbt b/build.sbt index 365b6a8..8159d0b 100644 --- a/build.sbt +++ b/build.sbt @@ -23,11 +23,4 @@ publishArtifact in(Test, packageSrc) := false shellPrompt in ThisBuild := { state => "sbt:"+Project.extract(state).currentRef.project + "> " } -publishTo := version { - version: String => - if (version.contains("-SNAPSHOT")) - Some("Sonatype Nexus Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots") - else - Some("Sonatype Nexus Releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") -}.value diff --git a/project/build.properties b/project/build.properties index c0bab04..0ef5b58 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1,17 @@ -sbt.version=1.2.8 +# +# Copyright 2014-2019 Jarek Sacha (jpsacha -at- gmail.com) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +sbt.version=1.3.3 diff --git a/project/sbt-sonatype.sbt b/project/sbt-sonatype.sbt index 8259c7a..3c3620a 100644 --- a/project/sbt-sonatype.sbt +++ b/project/sbt-sonatype.sbt @@ -1,4 +1,4 @@ // [https://github.com/xerial/sbt-sonatype] -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") // [https://github.com/sbt/sbt-pgp] addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") \ No newline at end of file diff --git a/sonatype.sbt b/sonatype.sbt index f4f04a6..d96d0a9 100644 --- a/sonatype.sbt +++ b/sonatype.sbt @@ -1,14 +1,12 @@ // Configuration for sbt-sonatype plugin -pomExtra := - - git@github.com:jpsacha/sbt-install4j.git - scm:git@github.com:jpsacha/sbt-install4j.git - - - - jpsacha - Jarek Sacha - https://github.com/jpsacha - - \ No newline at end of file +import xerial.sbt.Sonatype.GitHubHosting + +sonatypeProfileName := "com.github.jpsacha" +sonatypeProjectHosting := Some(GitHubHosting("jpsacha", "sbt-install4j", "jpsacha@gmail.com")) + +publishTo := sonatypePublishTo.value + +developers := List( + Developer(id = "jpsacha", name = "Jarek Sacha", email = "jpsacha@gmail.com", url = url("https://github.com/jpsacha")) +) \ No newline at end of file