Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Scala version to LTS and use actual play_3 lib #687

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Change Scala version to LTS and use actual play_3 lib #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions play-pac4j_3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,41 @@
<name>pac4j implementation for Play framework (Scala 3)</name>
<description>Security library for Play framework based on pac4j using Scala 3</description>

<properties>
<scala.major.version>3</scala.major.version>
<scala.version>3.3.3</scala.version>
<scala.maven.version>3.3.3</scala.maven.version>
</properties>

<dependencies>
<dependency>
<groupId>org.playframework</groupId>
<artifactId>play_${scala.version}</artifactId>
<artifactId>play_${scala.major.version}</artifactId>
<version>${play.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.playframework</groupId>
<artifactId>play-cache_${scala.version}</artifactId>
<artifactId>play-cache_${scala.major.version}</artifactId>
<version>${play.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala3-library_3</artifactId>
<version>3.4.2</version>
<version>${scala.version}</version>
</dependency>

<!-- tests -->
<dependency>
<groupId>org.playframework</groupId>
<artifactId>play-test_${scala.version}</artifactId>
<artifactId>play-test_${scala.major.version}</artifactId>
<version>${play.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala.major.version}</artifactId>
<version>${scalatest.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion shared/src/test/java/org/pac4j/play/filters/SecurityFilterTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class SecurityFilterTests extends ScalaFutures with Results {
def testThatSecurityFilterBlocksUnauthorizedRequests(): Unit = {
implicit val ec = scala.concurrent.ExecutionContext.global
implicit val as = ActorSystem("text-actor-system")
implicit val mat = ActorMaterializer()
implicit val mat: ActorMaterializer = ActorMaterializer()

val securityFilter = prepareSecurityFilter(
"""
Expand Down