Get publishing to Sonatype working #3
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,61 @@ | ||
| import xerial.sbt.Sonatype._ | ||
|
|
||
|
There was a problem hiding this comment. This was preventing See the alternative approach below with a root project. |
||
| lazy val commonSettings = Seq( | ||
| // We are overriding the default behavior of sbt-git which, by default, only | ||
| // appends the `-SNAPSHOT` suffix if there are uncommitted changes in the | ||
| // workspace. | ||
| version := { | ||
| if (git.gitDescribedVersion.value.isEmpty) | ||
| git.gitHeadCommit.value.get.substring(0, 7) + "-SNAPSHOT" | ||
rbreslow marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| else if (git.gitCurrentTags.value.isEmpty || git.gitUncommittedChanges.value) | ||
| git.gitDescribedVersion.value.get + "-SNAPSHOT" | ||
| else | ||
| git.gitDescribedVersion.value.get | ||
| }, | ||
| scalaVersion := "2.12.10", | ||
| cancelable in Global := true, | ||
| scalafmtOnCompile := true, | ||
| scapegoatVersion in ThisBuild := Versions.ScapegoatVersion, | ||
| scapegoatDisabledInspections := Seq("ObjectNames", "EmptyCaseClass"), | ||
| unusedCompileDependenciesFilter -= moduleFilter("com.sksamuel.scapegoat", "scalac-scapegoat-plugin"), | ||
| addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.6"), | ||
| addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.2.4"), | ||
| addCompilerPlugin( | ||
| "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full | ||
| ), | ||
| addCompilerPlugin(scalafixSemanticdb), | ||
| autoCompilerPlugins := true, | ||
| externalResolvers := Seq( | ||
| DefaultMavenRepository, | ||
| Resolver.sonatypeRepo("snapshots"), | ||
| Resolver.typesafeIvyRepo("releases"), | ||
| Resolver.bintrayRepo("azavea", "maven"), | ||
| Resolver.bintrayRepo("azavea", "geotrellis"), | ||
| "locationtech-releases" at "https://repo.locationtech.org/content/groups/releases", | ||
| "locationtech-snapshots" at "https://repo.locationtech.org/content/groups/snapshots", | ||
| Resolver.bintrayRepo("guizmaii", "maven"), | ||
| Resolver.bintrayRepo("colisweb", "maven"), | ||
| "jitpack".at("https://jitpack.io"), | ||
| Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))( | ||
| Resolver.ivyStylePatterns | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| lazy val noPublishSettings = Seq( | ||
|
There was a problem hiding this comment. This is so we don't publish the root project. |
||
| publish := {}, | ||
| publishLocal := {}, | ||
| publishArtifact := false | ||
| ) | ||
|
|
||
| lazy val publishSettings = Seq( | ||
| organization := "com.azavea.stac4s", | ||
| organizationName := "Azavea", | ||
| organizationHomepage := Some(new URL("https://azavea.com/")), | ||
| description := "stac4s is a scala library with primitives to build applications using the SpatioTemporal Asset Catalogs specification", | ||
| publishArtifact in Test := false | ||
| ) ++ sonatypeSettings ++ credentialSettings | ||
|
|
||
| lazy val sonatypeSettings = Seq( | ||
| publishMavenStyle := true, | ||
| sonatypeProfileName := "com.azavea", | ||
|
|
@@ -52,96 +90,46 @@ lazy val sonatypeSettings = Seq( | |
| publishTo := sonatypePublishTo.value | ||
| ) | ||
|
|
||
| lazy val credentialSettings = Seq( | ||
|
There was a problem hiding this comment. Some improvements to this block, courtsey of Eugene, geotrellis/vectorpipe@227de4f. |
||
| credentials ++= List( | ||
| for { | ||
| id <- sys.env.get("GPG_KEY_ID") | ||
| } yield Credentials("GnuPG Key ID", "gpg", id, "ignored"), | ||
| for { | ||
| user <- sys.env.get("SONATYPE_USERNAME") | ||
| pass <- sys.env.get("SONATYPE_PASSWORD") | ||
| } yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass) | ||
| ).flatten | ||
| ) | ||
|
|
||
| val coreDependencies = Seq( | ||
| "org.typelevel" %% "cats-core" % Versions.CatsVersion, | ||
| "io.circe" %% "circe-core" % Versions.CirceVersion, | ||
| "io.circe" %% "circe-generic" % Versions.CirceVersion, | ||
| "io.circe" %% "circe-parser" % Versions.CirceVersion, | ||
| "org.locationtech.geotrellis" %% "geotrellis-vector" % Versions.GeoTrellisVersion, | ||
| "eu.timepit" %% "refined" % Versions.RefinedVersion, | ||
| "org.scalacheck" %% "scalacheck" % Versions.scalacheckVersion % Test, | ||
| "io.chrisdavenport" %% "cats-scalacheck" % Versions.scalacheckCatsVersion % Test, | ||
| "org.scalatest" %% "scalatest" % Versions.scalatestVersion % Test, | ||
| "com.github.tbouron" % "spdx-license-checker" % Versions.spdxCheckerVersion, | ||
| "com.chuusai" %% "shapeless" % Versions.ShapelessVersion, | ||
| "io.spray" %% "spray-json" % Versions.sprayVersion | ||
| ) | ||
|
|
||
| lazy val root = project | ||
| .in(file(".")) | ||
| .settings(moduleName := "root") | ||
| .settings(commonSettings) | ||
| .settings(publishSettings) | ||
| .settings(noPublishSettings) | ||
| .aggregate(core) | ||
|
|
||
| lazy val core = (project in file("modules/core")) | ||
| .settings(commonSettings) | ||
| .settings(publishSettings) | ||
| .settings({ | ||
| libraryDependencies ++= coreDependencies | ||
| }) | ||
|
|
||
| lazy val coreRef = LocalProject("modules/core") | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| object Versions { | ||
| val CatsVersion = "1.6.0" | ||
| val CirceVersion = "0.11.1" | ||
| val GeoTrellisVersion = "3.0.0-M3" | ||
| val RefinedVersion = "0.9.3" | ||
| val ScapegoatVersion = "1.3.8" | ||
| val ShapelessVersion = "2.3.3" | ||
| val spdxCheckerVersion = "1.0.0" | ||
| val scalacheckCatsVersion = "0.1.1" | ||
| val scalatestVersion = "3.0.4" | ||
| val sprayVersion = "1.3.4" | ||
| val scalacheckVersion = "1.14.0" | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
|
|
@@ -7,21 +7,25 @@ if [[ -n "${STAC4S_DEBUG}" ]]; then | |
| fi | ||
|
|
||
| function usage() { | ||
| echo -n \ | ||
| "Usage: $(basename "$0") | ||
| Lint Scala source code and execute tests. | ||
| " | ||
| } | ||
|
|
||
rbreslow marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then | ||
| if [[ "${1:-}" == "--help" ]]; then | ||
| usage | ||
| else | ||
| echo "Linting Scala source code and executing tests" | ||
|
There was a problem hiding this comment. I decided not to carry over the color codes because they weren't working on my system: maiden:~ rbreslow$ echo -e "\e[32m[stac4s] Executing Scala Tests and Linting\e[0m"
\e[32m[stac4s] Executing Scala Tests and Linting\e[0mAlso, for consistency, because we weren't using them in If we were to include color codes, I would suggest an alternative approach that is portable (with diff --git a/scripts/test b/scripts/test
index 8a4de5f..816a1e7 100755
--- a/scripts/test
+++ b/scripts/test
@@ -13,11 +13,16 @@ Lint Scala source code and execute tests.
"
}
+function success() {
+ printf "$(tput setaf 2)%s$(tput sgr0)\n" $1
+}
+
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "${1:-}" == "--help" ]]; then
usage
else
- echo "Linting Scala source code and executing tests"
+ success "Linting Scala source code and executing tests"
+
./sbt ";\
scalafix --check; \
scalafmtCheck; \I would also consider whether the value the color codes add to the script outweighs what they subtract in terms of complexity and decreased readability. If it is something we want to standardize on, which is totally cool, it may be worth extending the STRTA ADR so we can get every repository on the same page going forward. There was a problem hiding this comment. Cool, I like your change -- in general I find the colors to be helpful in parsing the output of our STRTA commands (what's the command vs what's log output from processes the command invokes to be helpful). As to whether the increase in complexity for STRTA outweighs its usefulness - I would say that once written our STRTA commands aren't edited that much, but we run them often so it seems like a fair tradeoff. Nevertheless, I don't think this change should hold up the PR since it's more a matter of preference and the original edit didn't seem related to the goal of publishing artifacts. There was a problem hiding this comment.
Agreed. It's definitely helpful.
The thing in my mind is, if we replicate a At a higher level, it may be worth revisiting the STRTA ADR, because many projects have been deviating from the standards and that document should be updated for how we're developing apps today (Vagrant seems to be disused, etc). |
||
| ./sbt ";\ | ||
| scalafix --check; \ | ||
| scalafmtCheck; \ | ||
| scalafmtSbtCheck; \ | ||
| scapegoat; \ | ||
| undeclaredCompileDependenciesTest; \ | ||
| unusedCompileDependenciesTest; \ | ||
| test \ | ||
| " | ||
| fi | ||
| fi | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reminder to restore this before merging.