Skip to content

Commit 9bfe524

Browse files
committed
Migration to sbt-ci-release
1 parent b0642e7 commit 9bfe524

File tree

5 files changed

+56
-89
lines changed

5 files changed

+56
-89
lines changed

.circleci/config.yml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2
1+
version: 2.1
22
jobs:
33
build:
44
environment:
@@ -19,14 +19,41 @@ jobs:
1919
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
2020
sudo apt-get update -qq
2121
sudo apt-get install sbt
22-
no_output_timeout: 30m
2322
- checkout
2423
- restore_cache:
2524
key: scala-library-dependencies-{{ checksum "build.sbt" }}
2625
- run:
27-
command: |
28-
sbt clean ++"2.13.5" test
29-
no_output_timeout: 1h
26+
command: sbt scalafmtCheck
27+
- run:
28+
command: sbt +test
3029
- save_cache:
31-
paths: [ "~/.sbt/boot", "~/.ivy2/cache", "~/.cache/coursier", "~/.wixMySQL" ]
30+
paths: [ "~/.sbt/boot", "~/.ivy2/cache", "~/.cache/coursier" ]
31+
key: scala-library-dependencies-{{ checksum "build.sbt" }}
32+
release:
33+
docker:
34+
- image: circleci/openjdk:8-jdk
35+
steps:
36+
- checkout
37+
- restore_cache:
3238
key: scala-library-dependencies-{{ checksum "build.sbt" }}
39+
- run:
40+
command: git fetch --tags
41+
- run:
42+
command: sbt ci-release
43+
workflows:
44+
version: 2
45+
build-and-release:
46+
jobs:
47+
- build:
48+
filters:
49+
tags:
50+
only: /^v\d+\.\d+\.\d+$/
51+
- release:
52+
requires:
53+
- build
54+
filters:
55+
branches:
56+
only: main
57+
tags:
58+
only: /^v\d+\.\d+\.\d+$/
59+

build.sbt

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,18 @@ def crossScalacOptions(scalaVersion: String): Seq[String] = CrossVersion.partial
77
Seq("-Yinline-warnings")
88
}
99

10-
lazy val deploySettings = Seq(
11-
sonatypeProfileName := "com.github.j5ik2o",
12-
publishMavenStyle := true,
13-
Test / publishArtifact := false,
14-
pomIncludeRepository := { _ => false },
15-
pomExtra := {
16-
<url>https://github.com/j5ik2o/docker-controller-scala</url>
17-
<licenses>
18-
<license>
19-
<name>The MIT License</name>
20-
<url>http://opensource.org/licenses/MIT</url>
21-
</license>
22-
</licenses>
23-
<scm>
24-
<url>git@github.com:j5ik2o/docker-controller-scala.git</url>
25-
<connection>scm:git:github.com/j5ik2o/docker-controller-scala</connection>
26-
<developerConnection>scm:git:git@github.com:j5ik2o/docker-controller-scala.git</developerConnection>
27-
</scm>
28-
<developers>
29-
<developer>
30-
<id>j5ik2o</id>
31-
<name>Junichi Kato</name>
32-
</developer>
33-
</developers>
34-
},
35-
publishTo := sonatypePublishToBundle.value,
36-
credentials := {
37-
val ivyCredentials = (LocalRootProject / baseDirectory).value / ".credentials"
38-
val gpgCredentials = (LocalRootProject / baseDirectory).value / ".gpgCredentials"
39-
Credentials(ivyCredentials) :: Credentials(gpgCredentials) :: Nil
40-
}
41-
)
42-
4310
lazy val baseSettings = Seq(
4411
organization := "com.github.j5ik2o",
12+
homepage := Some(url("https://github.com/j5ik2o/docker-controller-scala")),
13+
licenses := List("The MIT License" -> url("http://opensource.org/licenses/MIT")),
14+
developers := List(
15+
Developer(
16+
id = "j5ik2o",
17+
name = "Junichi Kato",
18+
email = "j5ik2o@gmail.com",
19+
url = url("https://blog.j5ik2o.me")
20+
)
21+
),
4522
scalaVersion := Versions.scala212Version,
4623
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version),
4724
scalacOptions ++= (Seq(
@@ -62,13 +39,14 @@ lazy val baseSettings = Seq(
6239
libraryDependencies ++= Seq(
6340
scalatest.scalatest % Test
6441
),
42+
Test / publishArtifact := false,
6543
Test / fork := true,
6644
Test / parallelExecution := false,
6745
ThisBuild / scalafmtOnCompile := true
6846
)
6947

7048
val `docker-controller-scala-core` = (project in file("docker-controller-scala-core"))
71-
.settings(baseSettings, deploySettings)
49+
.settings(baseSettings)
7250
.settings(
7351
name := "docker-controller-scala-core",
7452
libraryDependencies ++= Seq(
@@ -97,7 +75,7 @@ val `docker-controller-scala-core` = (project in file("docker-controller-scala-c
9775
)
9876

9977
val `docker-controller-scala-scalatest` = (project in file("docker-controller-scala-scalatest"))
100-
.settings(baseSettings, deploySettings)
78+
.settings(baseSettings)
10179
.settings(
10280
name := "docker-controller-scala-scalatest",
10381
libraryDependencies ++= Seq(
@@ -107,7 +85,7 @@ val `docker-controller-scala-scalatest` = (project in file("docker-controller-sc
10785
).dependsOn(`docker-controller-scala-core`)
10886

10987
val `docker-controller-scala-dynamodb-local` = (project in file("docker-controller-scala-dynamodb-local"))
110-
.settings(baseSettings, deploySettings)
88+
.settings(baseSettings)
11189
.settings(
11290
name := "docker-controller-scala-dynamodb-local",
11391
libraryDependencies ++= Seq(
@@ -118,7 +96,7 @@ val `docker-controller-scala-dynamodb-local` = (project in file("docker-controll
11896
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
11997

12098
val `docker-controller-scala-minio` = (project in file("docker-controller-scala-minio"))
121-
.settings(baseSettings, deploySettings)
99+
.settings(baseSettings)
122100
.settings(
123101
name := "docker-controller-scala-minio",
124102
libraryDependencies ++= Seq(
@@ -129,7 +107,7 @@ val `docker-controller-scala-minio` = (project in file("docker-controller-scala-
129107
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
130108

131109
val `docker-controller-scala-zookeeper` = (project in file("docker-controller-scala-zookeeper"))
132-
.settings(baseSettings, deploySettings)
110+
.settings(baseSettings)
133111
.settings(
134112
name := "docker-controller-scala-zookeeper",
135113
libraryDependencies ++= Seq(
@@ -140,7 +118,7 @@ val `docker-controller-scala-zookeeper` = (project in file("docker-controller-sc
140118
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
141119

142120
val `docker-controller-scala-kafka` = (project in file("docker-controller-scala-kafka"))
143-
.settings(baseSettings, deploySettings)
121+
.settings(baseSettings)
144122
.settings(
145123
name := "docker-controller-scala-kafka",
146124
libraryDependencies ++= Seq(
@@ -155,7 +133,7 @@ val `docker-controller-scala-kafka` = (project in file("docker-controller-scala-
155133
)
156134

157135
val `docker-controller-scala-mysql` = (project in file("docker-controller-scala-mysql"))
158-
.settings(baseSettings, deploySettings)
136+
.settings(baseSettings)
159137
.settings(
160138
name := "docker-controller-scala-mysql",
161139
libraryDependencies ++= Seq(
@@ -166,7 +144,7 @@ val `docker-controller-scala-mysql` = (project in file("docker-controller-scala-
166144
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
167145

168146
val `docker-controller-scala-elasticsearch` = (project in file("docker-controller-scala-elasticsearch"))
169-
.settings(baseSettings, deploySettings)
147+
.settings(baseSettings)
170148
.settings(
171149
name := "docker-controller-scala-elasticsearch",
172150
libraryDependencies ++= Seq(
@@ -177,7 +155,7 @@ val `docker-controller-scala-elasticsearch` = (project in file("docker-controlle
177155
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
178156

179157
val `docker-controller-scala-localstack` = (project in file("docker-controller-scala-localstack"))
180-
.settings(baseSettings, deploySettings)
158+
.settings(baseSettings)
181159
.settings(
182160
name := "docker-controller-scala-localstack",
183161
libraryDependencies ++= Seq(
@@ -189,7 +167,7 @@ val `docker-controller-scala-localstack` = (project in file("docker-controller-s
189167
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
190168

191169
val `docker-controller-scala-root` = (project in file("."))
192-
.settings(baseSettings, deploySettings)
170+
.settings(baseSettings)
193171
.settings(name := "docker-controller-scala-root")
194172
.aggregate(
195173
`docker-controller-scala-core`,

project/plugins.sbt

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
resolvers ++= Seq(
2-
"Sonatype OSS Snapshot Repository" at "https://oss.sonatype.org/content/repositories/snapshots",
3-
"Sonatype OSS Release Repository" at "https://oss.sonatype.org/content/repositories/releases/"
4-
)
5-
6-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
7-
81
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
92

10-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
11-
12-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.4")
13-
14-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
15-
16-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
17-
183
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
4+
5+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")

release.sbt

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

version.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)