Skip to content

Commit 63bffd6

Browse files
committed
upgrade dependencies
1 parent b2d3f36 commit 63bffd6

File tree

9 files changed

+56
-45
lines changed

9 files changed

+56
-45
lines changed

.github/workflows/release.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,28 @@ jobs:
3535
java-version: '8'
3636
distribution: 'temurin'
3737
# cache: 'sbt'
38-
- name: Run tests & publish
39-
run: sbt test publish
38+
- name: Run tests & Coverage Report
39+
run: sbt coverage test coverageReport
40+
- name: Upload coverage to Codecov
41+
uses: codecov/codecov-action@v3
42+
with:
43+
files: common/target/scala-2.12/coverage-report/cobertura.xml,core/target/scala-2.12/coverage-report/cobertura.xml,teskit/target/scala-2.12/coverage-report/cobertura.xml
44+
flags: unittests
45+
fail_ci_if_error: true
46+
verbose: true
47+
- name: Publish
48+
run: sbt publish
49+
50+
lint:
51+
runs-on: ubuntu-latest
52+
steps:
53+
- name: Checkout
54+
uses: actions/checkout@v3
55+
- name: Set up JDK 8
56+
uses: actions/setup-java@v3
57+
with:
58+
java-version: '8'
59+
distribution: 'temurin'
60+
# cache: 'sbt'
61+
- name: Formatting
62+
run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck
Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
package app.softnetwork.notification.api
22

3-
import akka.actor
4-
import akka.actor.typed.ActorSystem
5-
import app.softnetwork.persistence.jdbc.schema.{JdbcSchema, JdbcSchemaTypes}
6-
import app.softnetwork.persistence.schema.{Schema, SchemaProvider, SchemaType}
7-
import app.softnetwork.persistence.typed._
8-
import com.typesafe.config.Config
3+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
4+
import app.softnetwork.persistence.schema.SchemaType
95
import org.slf4j.{Logger, LoggerFactory}
106

11-
object AllNotificationsPostgresLauncher extends AllNotificationsApi with SchemaProvider {
7+
object AllNotificationsPostgresLauncher extends AllNotificationsApi with JdbcSchemaProvider {
128

139
lazy val log: Logger = LoggerFactory getLogger getClass.getName
1410

15-
override def schema: ActorSystem[_] => Schema = sys =>
16-
new JdbcSchema {
17-
override def schemaType: SchemaType = JdbcSchemaTypes.Postgres
18-
override implicit def classicSystem: actor.ActorSystem = sys
19-
override def config: Config = AllNotificationsPostgresLauncher.this.config
20-
}
11+
override def schemaType: SchemaType = JdbcSchemaTypes.Postgres
2112
}

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerPostgresLauncher.scala

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package app.softnetwork.notification.api
2+
3+
import app.softnetwork.persistence.schema.SchemaProvider
4+
import app.softnetwork.scheduler.api.SwaggerSchedulerApi
5+
6+
trait AllNotificationsWithSwaggerSchedulerApi
7+
extends AllNotificationsWithSchedulerApi
8+
with SwaggerSchedulerApi { _: SchemaProvider => }
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package app.softnetwork.notification.api
2+
3+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
4+
import app.softnetwork.persistence.schema.SchemaType
5+
import org.slf4j.{Logger, LoggerFactory}
6+
7+
object AllNotificationsWithSwaggerSchedulerPostgresLauncher
8+
extends AllNotificationsWithSwaggerSchedulerApi
9+
with JdbcSchemaProvider {
10+
11+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
12+
13+
override def schemaType: SchemaType = JdbcSchemaTypes.Postgres
14+
}

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
3131

3232
name := "notification"
3333

34-
ThisBuild / version := "0.3.0.1"
34+
ThisBuild / version := "0.3.1"
3535

3636
ThisBuild / scalaVersion := "2.12.15"
3737

common/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ libraryDependencies ++= Seq(
1010
"app.softnetwork.persistence" %% "persistence-kv" % Versions.genericPersistence,
1111
"app.softnetwork.scheduler" %% "scheduler-common" % Versions.scheduler,
1212
"app.softnetwork.scheduler" %% "scheduler-common" % Versions.scheduler % "protobuf",
13-
"app.softnetwork.api" %% "generic-server-api" % Versions.server,
13+
"app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
1414
"app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.6",
1515
"org.apache.commons" % "commons-email" % "1.5",
1616
"com.google.auth" % "google-auth-library-oauth2-http" % "0.20.0" excludeAll guavaExclusion,

project/src/main/scala/app/softnetwork/sbt/build/Versions.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package app.softnetwork.sbt.build
22

33
object Versions {
44

5-
val genericPersistence = "0.3.0.3"
5+
val genericPersistence = "0.3.1"
66

7-
val scheduler = "0.3.0.1"
8-
9-
val server = "0.3.0.3"
7+
val scheduler = "0.3.1"
108

119
val scalatest = "3.1.1"
1210
}

testkit/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name := "notification-testkit"
88

99
libraryDependencies ++= Seq(
1010
"app.softnetwork.scheduler" %% "scheduler-testkit" % Versions.scheduler,
11-
"app.softnetwork.api" %% "generic-server-api-testkit" % Versions.server,
11+
"app.softnetwork.api" %% "generic-server-api-testkit" % Versions.genericPersistence,
1212
"com.github.kirviq" % "dumbster" % "1.7.1",
1313
"org.rapidoid" % "rapidoid-http-server" % "5.5.5"
1414
)

0 commit comments

Comments
 (0)