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.

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

Update dependencies & support scala 2.13 #36

Merged
merged 2 commits into from Apr 12, 2021

Conversation

cchantep
Copy link
Contributor

  • Update dependencies and Scala version (support 2.13)
  • Fix warnings/code smells
  • Update CI

@@ -1,25 +1,88 @@
import Dependencies._

inThisBuild(List(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update build to support Scala 2.13 and with property compilation options

@@ -1,17 +1,17 @@
import sbt._

object Dependencies {
val scalacheckVersion = "1.14.3"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated dependencies

@@ -0,0 +1,54 @@
import sbt.Keys._
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scapegoat configuration to check code smell at compilation

@@ -171,7 +171,10 @@ case class AkkaHttpWebContext(request: HttpRequest,
addResponseCookie(cookie)
}

def addResponseCsrfCookie(): Unit = CsrfCookieAuthorizer(this, Some(sessionStorage.sessionLifetime))
def addResponseCsrfCookie(): Unit = {
CsrfCookieAuthorizer(this, Some(sessionStorage.sessionLifetime))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discarded unit-value

@@ -150,7 +156,7 @@ class AkkaHttpSecurityTest extends WordSpecLike with Matchers with ScalatestRout
} ~> check {
status shouldEqual StatusCodes.OK
responseAs[String] shouldBe "called!"
headers.size shouldBe 1
headers.size shouldBe 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are there 2 now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Akka-HTTP no longer prevent duplicate from what I see

project/Dependencies.scala Show resolved Hide resolved
@hierynomus hierynomus mentioned this pull request Mar 17, 2021
@cchantep cchantep force-pushed the task/update branch 2 times, most recently from 6614a0d to b70b796 Compare March 17, 2021 21:30
@hierynomus
Copy link
Contributor

Just noticed one more thing, we're using GH Actions nowadays, not the Travis build anymore. Can you update the flow to do the crosscompile and scapegoat also?

Thanks!

@cchantep
Copy link
Contributor Author

Scapegoat doesn't support 2.13

- Fix warnings/code smells
- Update CI
@cchantep
Copy link
Contributor Author

done

@cchantep
Copy link
Contributor Author

Up

@cchantep
Copy link
Contributor Author

up

@cchantep
Copy link
Contributor Author

Up

@hierynomus hierynomus merged commit dd00c8e into StackVista:master Apr 12, 2021
@cchantep cchantep deleted the task/update branch April 12, 2021 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants