Introduce sbt-ci-release

sbt · Sep 19, 2022 · cebf84f · cebf84f
1 parent bc39aa5
commit cebf84f
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 30 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -20,9 +20,7 @@ jobs:
  java: 11, 8
  scala: 2.12.17
  cmd: |
- sbt ++$MATRIX_SCALA test
- # Test sample applications
- sbt ++$MATRIX_SCALA scripted
+ sbt ++$MATRIX_SCALA test scripted
 
  finish:
  name: Finish

diff --git a/build.sbt b/build.sbt
@@ -1,17 +1,9 @@
-val baseVersion = "6.0.0-M1"
-
 lazy val root = (project in file("."))
  .enablePlugins(SbtPlugin)
  .settings(
- sbtrelease.ReleasePlugin.projectSettings ++
  Seq(
- organization := "com.typesafe.sbteclipse",
- name := "sbteclipse-plugin",
- version := baseVersion,
- sbtPlugin := true,
- (GlobalScope / sbtVersion) := {
- System.getProperty("sbt.build.version", (GlobalScope / sbtVersion).value)
- },
+ organization := "com.github.sbt",
+ name := "sbt-eclipse",
  scalacOptions ++= Seq("-unchecked", "-deprecation", "-target:jvm-1.8"),
  scalaVersion := "2.12.17",
  libraryDependencies ++= Seq(
@@ -20,7 +12,7 @@ lazy val root = (project in file("."))
  "org.scalaz" %% "scalaz-effect" % "7.2.34",
  "org.scalatest" %% "scalatest" % "3.2.3" % "test"
  ),
- publishMavenStyle := false,
+ homepage := Some(url("https://github.com/sbt/sbt-eclipse")),
  licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),
  (Compile / packageDoc / publishArtifact) := false,
  (Compile / packageSrc / publishArtifact) := false,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,2 @@
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
-addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
diff --git a/src/sbt-test/sbteclipse/.05-nested-managed-src/build.sbt b/src/sbt-test/sbteclipse/.05-nested-managed-src/build.sbt
@@ -2,7 +2,7 @@ import scala.xml.XML
 import sbtprotobuf.ProtobufPlugin
 import sys.error
 
-organization := "com.typesafe.sbteclipse"
+organization := "com.github.sbt"
 
 name := "sbteclipse-test"
 

diff --git a/src/sbt-test/sbteclipse/.05-nested-managed-src/project/plugins.sbt b/src/sbt-test/sbteclipse/.05-nested-managed-src/project/plugins.sbt
@@ -3,7 +3,7 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
 
 addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.2")

diff --git a/src/sbt-test/sbteclipse/00-defaults/build.sbt b/src/sbt-test/sbteclipse/00-defaults/build.sbt
@@ -1,5 +1,5 @@
 
-organization := "com.typesafe.sbteclipse"
+organization := "com.github.sbt"
 
 name := "sbteclipse-test"
 

diff --git a/src/sbt-test/sbteclipse/00-defaults/project/plugins.sbt b/src/sbt-test/sbteclipse/00-defaults/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
diff --git a/src/sbt-test/sbteclipse/01-structure/project/plugins.sbt b/src/sbt-test/sbteclipse/01-structure/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
diff --git a/src/sbt-test/sbteclipse/02-contents/build.sbt b/src/sbt-test/sbteclipse/02-contents/build.sbt
@@ -2,7 +2,7 @@
 (ThisBuild / EclipseKeys.withSource) := false
 (ThisBuild / EclipseKeys.withJavadoc) := false
 
-organization := "com.typesafe.sbteclipse"
+organization := "com.github.sbt"
 
 name := "sbteclipse-test"
 

diff --git a/src/sbt-test/sbteclipse/02-contents/project/plugins.sbt b/src/sbt-test/sbteclipse/02-contents/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
diff --git a/src/sbt-test/sbteclipse/03-sbt-dependency-withsources/build.sbt b/src/sbt-test/sbteclipse/03-sbt-dependency-withsources/build.sbt
@@ -3,7 +3,7 @@ import scala.xml.XML
 
 EclipseKeys.withJavadoc := false
 
-organization := "com.typesafe.sbteclipse"
+organization := "com.github.sbt"
 
 name := "sbteclipse-test"
 

diff --git a/src/sbt-test/sbteclipse/03-sbt-dependency-withsources/project/plugins.sbt b/src/sbt-test/sbteclipse/03-sbt-dependency-withsources/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
diff --git a/src/sbt-test/sbteclipse/04-dependency-options/project/plugins.sbt b/src/sbt-test/sbteclipse/04-dependency-options/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
diff --git a/src/sbt-test/sbteclipse/04-dependency-options/tasks.sbt b/src/sbt-test/sbteclipse/04-dependency-options/tasks.sbt
@@ -5,7 +5,7 @@ import sys.error
 (ThisBuild / EclipseKeys.withSource) := false
 (ThisBuild / EclipseKeys.withJavadoc) := false
 
-organization := "com.typesafe.sbteclipse"
+organization := "com.github.sbt"
 
 name := "sbteclipse-test"
 

diff --git a/src/sbt-test/sbteclipse/06-multi-scala-version-support/project/plugins.sbt b/src/sbt-test/sbteclipse/06-multi-scala-version-support/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }
diff --git a/src/sbt-test/sbteclipse/06-multi-scala-version-support/tasks.sbt b/src/sbt-test/sbteclipse/06-multi-scala-version-support/tasks.sbt
@@ -6,7 +6,7 @@ import sys.error
 
 (ThisBuild / EclipseKeys.skipParents) := false
 
-organization := "com.typesafe.sbteclipse"
+organization := "com.github.sbt"
 
 name := "sbteclipse-test"
 

diff --git a/src/sbt-test/sbteclipse/07-disabled-plugin/project/plugins.sbt b/src/sbt-test/sbteclipse/07-disabled-plugin/project/plugins.sbt
@@ -3,5 +3,5 @@
  if(pluginVersion == null)
  throw new RuntimeException("""|The system property 'plugin.version' is not defined.
  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
- else addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % pluginVersion)
+ else addSbtPlugin("com.github.sbt" % "sbt-eclipse" % pluginVersion)
 }