Skip to content

Commit 7792d12

Browse files
authored
* Use sbt-ci-release (#604)
* Delete RFReleasePlugin.scala - now handled by Makefile and CI
1 parent 343940b commit 7792d12

File tree

8 files changed

+28
-133
lines changed

8 files changed

+28
-133
lines changed

.jvmopts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-Xms2g
22
-Xmx4g
3+
-XX:+UseG1GC

build.sbt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121

2222
// Leave me and my custom keys alone!
2323
Global / lintUnusedKeysOnLoad := false
24+
ThisBuild / versionScheme := Some("semver-spec")
2425

2526
addCommandAlias("makeSite", "docs/makeSite")
2627
addCommandAlias("previewSite", "docs/previewSite")
2728
addCommandAlias("ghpagesPushSite", "docs/ghpagesPushSite")
2829
addCommandAlias("console", "datasource/console")
2930

31+
ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"
32+
ThisBuild / sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
33+
3034
// Prefer our own IntegrationTest config definition, which inherits from Test.
3135
lazy val IntegrationTest = config("it") extend Test
3236

3337
lazy val root = project
3438
.in(file("."))
3539
.withId("RasterFrames")
3640
.aggregate(core, datasource, pyrasterframes)
37-
.enablePlugins(RFReleasePlugin)
38-
.settings(
39-
publish / skip := true,
40-
clean := clean.dependsOn(`rf-notebook`/clean, docs/clean).value
41-
)
4241

4342
lazy val `rf-notebook` = project
4443
.dependsOn(pyrasterframes)
44+
.disablePlugins(CiReleasePlugin)
4545
.enablePlugins(RFAssemblyPlugin, DockerPlugin)
4646
.settings(publish / skip := true)
4747

@@ -102,8 +102,10 @@ lazy val core = project
102102

103103
lazy val pyrasterframes = project
104104
.dependsOn(core, datasource)
105+
.disablePlugins(CiReleasePlugin)
105106
.enablePlugins(RFAssemblyPlugin, PythonBuildPlugin)
106107
.settings(
108+
publish / skip := true,
107109
libraryDependencies ++= Seq(
108110
geotrellis("s3").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
109111
spark("core").value % Provided,
@@ -138,7 +140,7 @@ lazy val datasource = project
138140
|import org.locationtech.rasterframes.datasource.geotiff._
139141
|""".stripMargin,
140142
IntegrationTest / fork := true,
141-
IntegrationTest / javaOptions := Seq("-Xmx3g")
143+
IntegrationTest / javaOptions := Seq("-Xmx3g -XX:+UseG1GC")
142144
)
143145

144146
lazy val experimental = project
@@ -160,8 +162,10 @@ lazy val experimental = project
160162

161163
lazy val docs = project
162164
.dependsOn(core, datasource, pyrasterframes)
165+
.disablePlugins(CiReleasePlugin)
163166
.enablePlugins(SiteScaladocPlugin, ParadoxPlugin, ParadoxMaterialThemePlugin, GhpagesPlugin, ScalaUnidocPlugin)
164167
.settings(
168+
publish / skip := true,
165169
apiURL := Some(url("https://rasterframes.io/latest/api")),
166170
autoAPIMappings := true,
167171
ghpagesNoJekyll := true,
@@ -197,5 +201,6 @@ lazy val docs = project
197201
)
198202

199203
lazy val bench = project
204+
.disablePlugins(CiReleasePlugin)
200205
.dependsOn(core % "compile->test")
201-
.settings(publish / skip := true)
206+
.settings(publish / skip := true)

project/RFProjectPlugin.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import com.typesafe.sbt.{GitPlugin, SbtGit}
2-
import com.typesafe.sbt.SbtGit.git
1+
import com.github.sbt.git.{GitPlugin, SbtGit}
2+
import com.github.sbt.git.SbtGit.git
33
import sbt.Keys._
44
import sbt._
55
import xerial.sbt.Sonatype.autoImport._
@@ -42,8 +42,6 @@ object RFProjectPlugin extends AutoPlugin {
4242
}
4343
},
4444
Global / cancelable := true,
45-
ThisBuild / publishTo := sonatypePublishTo.value,
46-
publishMavenStyle := true,
4745
Compile / packageDoc / publishArtifact := true,
4846
Test / publishArtifact := false,
4947
// don't fork it in tests to reduce memory usage

project/RFReleasePlugin.scala

Lines changed: 0 additions & 107 deletions
This file was deleted.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.0
1+
sbt.version=1.8.2

project/plugins.sbt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
logLevel := sbt.Level.Error
22

33
addDependencyTreePlugin
4-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")
5-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
4+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
5+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
6+
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
67
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
7-
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
8-
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
98
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.5.5")
109
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
1110
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.6")
12-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")
13-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
14-
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
1511
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.10")
16-
addSbtPlugin("com.github.gseitz" %% "sbt-release" % "1.0.9")
1712
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.19")
18-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
19-
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
2013
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
14+
15+
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.7.0")
16+
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
17+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")
18+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
19+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")

pyrasterframes/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
*.pyc
1+
**/*.pyc
22
**/dist/
33
**/build/
44
**/*.egg-info
55
.eggs
66
.pytest_cache
7-

rf-notebook/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import scala.sys.process.Process
22
import PythonBuildPlugin.autoImport.pyWhl
3-
import com.typesafe.sbt.git.DefaultReadableGit
3+
import com.github.sbt.git.DefaultReadableGit
44

55
lazy val includeNotebooks = settingKey[Boolean]("Whether to build documentation into notebooks and include them")
66
includeNotebooks := true
@@ -10,7 +10,7 @@ Docker / packageName := "s22s/rasterframes-notebook"
1010
Docker / version := version.value
1111

1212
dockerAliases += dockerAlias.value.withTag({
13-
val sha = new DefaultReadableGit(file(".")).withGit(_.headCommitSha)
13+
val sha = new DefaultReadableGit(file("."), None).withGit(_.headCommitSha)
1414
sha.map(_.take(7))
1515
})
1616

0 commit comments

Comments
 (0)