From 021118f53d8bf18f8cd430eab6d7e55ec3de1a61 Mon Sep 17 00:00:00 2001 From: "Ariel Shaqed (Scolnicov)" Date: Wed, 23 Aug 2023 14:45:47 +0300 Subject: [PATCH 1/2] Add missing scmInfo, developers, and move "publishTo" to be ThisBuild Getting 400s when trying to publish without this :-( --- build.sbt | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 3425d61..55a254b 100644 --- a/build.sbt +++ b/build.sbt @@ -23,18 +23,15 @@ libraryDependencies ++= Seq( val nexus = "https://s01.oss.sonatype.org/" lazy val publishSettings = Seq( - publishTo := { - if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots") - else Some("releases" at nexus + "service/local/staging/deploy/maven2") - }, // Remove all additional repository other than Maven Central from POM pomIncludeRepository := { _ => false }, credentials ++= Seq( Credentials(Path.userHome / ".sbt" / "credentials"), Credentials(Path.userHome / ".sbt" / "sonatype_credentials") - ) + ), ) +ThisBuild / publishConfiguration := publishConfiguration.value.withOverwrite(true) ThisBuild / isSnapshot := false ThisBuild / versionScheme := Some("early-semver") ThisBuild / organization := "io.lakefs" @@ -45,3 +42,51 @@ ThisBuild / licenses := List( "Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt") ) ThisBuild / homepage := Some(url("https://lakefs.io")) +ThisBuild / publishTo := { + if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots") + else Some("releases" at nexus + "service/local/staging/deploy/maven2") +} +ThisBuild / scmInfo := Some( + ScmInfo( + url("https://github.com/treeverse/lakefs-spark-extensions"), + "scm:git@github.com:treeverse/lakefs-spark-extensions.git" + ) +) +ThisBuild / developers := List( + Developer( + id = "ariels", + name = "Ariel Shaqed (Scolnicov)", + email = "ariels@treeverse.io", + url = url("https://github.com/arielshaqed") + ), + Developer( + id = "baraktr", + name = "B. A.", + email = "barak.amar@treeverse.io", + url = url("https://github.com/nopcoder") + ), + Developer( + id = "ozkatz", + name = "Oz Katz", + email = "oz.katz@treeverse.io", + url = url("https://github.com/ozkatz") + ), + Developer( + id = "johnnyaug", + name = "J. A.", + email = "yoni.augarten@treeverse.io", + url = url("https://github.com/johnnyaug") + ), + Developer( + id = "itai.admi", + name = "Itai Admi", + email = "itai.admi@treeverse.io", + url = url("https://github.com/itaiad200") + ), + Developer( + id = "niro", + name = "Nir Ozery", + email = "nir.ozery@treeverse.io", + url = url("https://github.com/N-o-Z") + ) +) From 9c5307ca7428e28b1ef019ffe0917cc31683e81f Mon Sep 17 00:00:00 2001 From: "Ariel Shaqed (Scolnicov)" Date: Wed, 18 Oct 2023 09:28:37 +0300 Subject: [PATCH 2/2] Actually package the right project Was publishing an empty JAR after some recent change. SBT is weird. --- .gitignore | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ build.sbt | 7 ++---- 2 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6880d89 --- /dev/null +++ b/.gitignore @@ -0,0 +1,70 @@ +# This is https://raw.githubusercontent.com/scala/scala/2.13.x/.gitignore + +# Are you tempted to edit this file? +# +# First consider if the changes make sense for all, +# or if they are specific to your workflow/system. +# If it is the latter, you can augment this list with +# entries in .git/info/excludes +# +# see also test/files/.gitignore +# + +# +# JARs aren't checked in, they are fetched by sbt +# +/lib/*.jar +/test/files/codelib/*.jar +/test/files/lib/*.jar +/test/files/speclib/instrumented.jar +/tools/*.jar + +# Developer specific properties +/build.properties +/buildcharacter.properties + +# might get generated when testing Jenkins scripts locally +/jenkins.properties + +# target directory for build +/build/ + +# other +/out/ +/bin/ +/sandbox/ + +# intellij +/src/intellij*/*.iml +/src/intellij*/*.ipr +/src/intellij*/*.iws +**/.cache +/.idea +/.settings + +# vscode +/.vscode + +# Standard symbolic link to build/quick/bin +/qbin + +# sbt's target directories +/target/ +/project/**/target/ +/test/macro-annot/target/ +/test/files/target/ +/test/target/ +/build-sbt/ +local.sbt +jitwatch.out + +# Used by the restarr/restarrFull commands as target directories +/build-restarr/ +/target-restarr/ + +# metals +.metals +.bloop +project/**/metals.sbt + +.bsp diff --git a/build.sbt b/build.sbt index 55a254b..83a3501 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,6 @@ -lazy val projectVersion = "0.0.1" +lazy val projectVersion = "0.0.3-RC.0" -lazy val project = Project("lakefs-spark-extension", file("./src/")) - .settings( - version := projectVersion, - ) +version := projectVersion semanticdbEnabled := true semanticdbVersion := scalafixSemanticdb.revision