Skip to content

Commit c177a6d

Browse files
fupelaqufupelaqu
committed
upgrade dependencies
1 parent 68e0c38 commit c177a6d

15 files changed

+64
-16
lines changed

‎build.sbt‎

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

33
name := "notification"
44

5-
ThisBuild / version := "0.5.1"
5+
ThisBuild / version := "0.6.0"
66

77
ThisBuild / scalaVersion := "2.12.18"
88

‎project/Versions.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
object Versions {
22

3-
val genericPersistence = "0.5.1"
3+
val genericPersistence = "0.6.0"
44

5-
val scheduler = "0.5.1"
5+
val scheduler = "0.6.0"
66

77
val scalatest = "3.2.16"
88
}

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/AllNotificationsTestKit.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ import app.softnetwork.session.service.SessionMaterials
2424
import com.typesafe.config.Config
2525
import org.scalatest.Suite
2626
import org.slf4j.{Logger, LoggerFactory}
27+
import org.softnetwork.session.model.Session
2728

2829
trait AllNotificationsTestKit
2930
extends NotificationGrpcServer[Notification]
3031
with NotificationTestKit[Notification]
31-
with ApnsToken { _: Suite with SessionMaterials =>
32+
with ApnsToken { _: Suite with SessionMaterials[Session] =>
3233

3334
lazy val apnsPort: Int = availablePort
3435

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/ApnsNotificationsTestKit.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import org.scalatest.Suite
2323
import app.softnetwork.notification.model.Push
2424
import app.softnetwork.session.service.SessionMaterials
2525
import org.slf4j.{Logger, LoggerFactory}
26+
import org.softnetwork.session.model.Session
2627

2728
trait ApnsNotificationsTestKit
2829
extends NotificationGrpcServer[Push]
2930
with NotificationTestKit[Push]
30-
with ApnsToken { _: Suite with SessionMaterials =>
31+
with ApnsToken { _: Suite with SessionMaterials[Session] =>
3132

3233
lazy val apnsPort: Int = availablePort
3334

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmAndApnsNotificationsTestKit.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ import org.scalatest.Suite
2424
import app.softnetwork.notification.model.Push
2525
import app.softnetwork.session.service.SessionMaterials
2626
import org.slf4j.{Logger, LoggerFactory}
27+
import org.softnetwork.session.model.Session
2728

2829
trait FcmAndApnsNotificationsTestKit
2930
extends NotificationGrpcServer[Push]
3031
with NotificationTestKit[Push]
31-
with ApnsToken { _: Suite with SessionMaterials =>
32+
with ApnsToken { _: Suite with SessionMaterials[Session] =>
3233

3334
lazy val apnsPort: Int = availablePort
3435

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmNotificationsTestKit.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ import org.scalatest.Suite
2424
import app.softnetwork.notification.model.Push
2525
import app.softnetwork.session.service.SessionMaterials
2626
import org.slf4j.{Logger, LoggerFactory}
27+
import org.softnetwork.session.model.Session
2728

2829
trait FcmNotificationsTestKit extends NotificationGrpcServer[Push] with NotificationTestKit[Push] {
29-
_: Suite with SessionMaterials =>
30+
_: Suite with SessionMaterials[Session] =>
3031

3132
override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Push]] = _ =>
3233
Seq(

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/NotificationTestKit.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ trait NotificationTestKit[T <: Notification]
3434
extends SchedulerTestKit
3535
with NotificationGuardian[T]
3636
with ApnsToken {
37-
_: Suite with SessionMaterials =>
37+
_: Suite with SessionMaterials[Session] =>
3838

3939
override implicit def ts: ActorSystem[_] = typedSystem()
4040

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/SMSModeNotificationsTestKit.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ import org.scalatest.Suite
2323
import app.softnetwork.notification.model.SMS
2424
import app.softnetwork.session.service.SessionMaterials
2525
import org.slf4j.{Logger, LoggerFactory}
26+
import org.softnetwork.session.model.Session
2627

2728
trait SMSModeNotificationsTestKit
2829
extends NotificationGrpcServer[SMS]
29-
with NotificationTestKit[SMS] { _: Suite with SessionMaterials =>
30+
with NotificationTestKit[SMS] { _: Suite with SessionMaterials[Session] =>
3031

3132
lazy val smsPort: Int = availablePort
3233

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/SimpleMailNotificationsTestKit.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ import org.scalatest.Suite
2323
import app.softnetwork.notification.model.Mail
2424
import app.softnetwork.session.service.SessionMaterials
2525
import org.slf4j.{Logger, LoggerFactory}
26+
import org.softnetwork.session.model.Session
2627

2728
trait SimpleMailNotificationsTestKit
2829
extends NotificationGrpcServer[Mail]
29-
with NotificationTestKit[Mail] { _: Suite with SessionMaterials =>
30+
with NotificationTestKit[Mail] { _: Suite with SessionMaterials[Session] =>
3031

3132
lazy val smtpPort: Int = availablePort
3233

‎testkit/src/test/scala/app/softnetwork/notification/handlers/AllNotificationsHandlerSpec.scala‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ package app.softnetwork.notification.handlers
33
import org.scalatest.wordspec.AnyWordSpecLike
44
import app.softnetwork.notification.message._
55
import app.softnetwork.notification.scalatest.AllNotificationsTestKit
6+
import app.softnetwork.session.handlers.SessionRefreshTokenDao
67
import app.softnetwork.session.service.BasicSessionMaterials
8+
import com.softwaremill.session.RefreshTokenStorage
79
import org.slf4j.{Logger, LoggerFactory}
10+
import org.softnetwork.session.model.Session
811

912
import scala.util.{Failure, Success}
1013

@@ -14,7 +17,11 @@ class AllNotificationsHandlerSpec
1417
extends AllNotificationsHandler
1518
with AnyWordSpecLike
1619
with AllNotificationsTestKit
17-
with BasicSessionMaterials {
20+
with BasicSessionMaterials[Session] {
21+
22+
override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
23+
ts
24+
)
1825

1926
lazy val log: Logger = LoggerFactory getLogger getClass.getName
2027

0 commit comments

Comments
 (0)