Current development branch

.gitignore

@@ -1,4 +1,16 @@
-.idea
-
+# Build
 target
 project/target
+
+# IntelliJ
+.idea
+
+# VS Code
+.vscode
+
+# Metals
+.bloop
+.bsp
+.metals
+metals.sbt
+project/project

.scalafix.conf

@@ -0,0 +1,17 @@
+// https://github.com/liancheng/scalafix-organize-imports
+OrganizeImports {
+  blankLines = Auto
+  coalesceToWildcardImportThreshold = 5
+  expandRelative = false
+  groupExplicitlyImportedImplicitsSeparately = false
+  groupedImports = Merge
+  groups = [
+    "*"
+    "java."
+    "scala."
+  ]
+  importSelectorsOrder = Ascii
+  importsOrder = Ascii
+  preset = DEFAULT
+  removeUnused = true
+}

.scalafmt.conf

@@ -0,0 +1,8 @@
+version = "3.0.0-RC2"
+
+runner.dialect = scala3
+
+newlines.topLevelStatements = [before]
+newlines.afterCurlyLambdaParams = preserve
+
+docstrings.wrap = "no"

CHANGELOG.md

@@ -1,16 +1,15 @@
 # Changelog
 
-## Version 1.0.0 (2017-11-12)
+All notable changes to this project will be documented in this file.
 
-### New features
-- Encode and decode JWT token
-- suppot hashing algorithms: 
-- - HS256
-- - HS384
-- - HS512
-- - RS256
-- - RS384
-- - RS512
-- - ES256
-- - ES384
-- - ES512
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.1.0]
+
+### ✨ Feature
+
+* Add CHANGELOG to root directory
+
+## [1.0.0]
+
+* Encode and decode JWT tokens support for following hashing algorithms (HS256, HS384, HS512, RS256, RS384, RS512, ES256, ES384 and ES512)

README.md

@@ -1,16 +1,19 @@
 # spray-jwt
+
 JWT library to use with spray-json and akka-http.
 
 ## Install
+
 Add spray-jwt as dependency to your `build.sbt`:
 
-```sbtshell
+```sbt
 libraryDependencies ++= Seq(
   "com.github.janjaali" %% "spray-jwt" % "1.0.0"
 )
 ```
 
 To encode a JsValue to a JWT token:
+
 ```scala
 import org.janjaali.sprayjwt.Jwt
 import org.janjaali.sprayjwt.algorithms.HS256
@@ -20,6 +23,7 @@ val jwtOpt = Jwt.encode(payload, "super_fancy_secret", HS256)
 ```
 
 And vice versa to decode JWT token as a JsValue:
+
 ```scala
 import org.janjaali.sprayjwt.Jwt
 import org.janjaali.sprayjwt.algorithms.HS256
@@ -29,17 +33,11 @@ val jsValueOpt = Jwt.decode(token, "super_fancy_secret")
 ```
 
 ## Supported algorithms
-- HS256
-- HS384
-- HS512
-
-- RS256
-- RS384
-- RS512
 
-## Source Code Style
-Check style via [scalastyle](http://www.scalastyle.org/):
+* HS256
+* HS384
+* HS512
 
-```sbtshell
-sbt scalastyle
-```
+* RS256
+* RS384
+* RS512

build.sbt

@@ -1,70 +1,60 @@
-import scala.sys.process._
-
-name := "spray-jwt"
-
-organization := "com.github.janjaali"
-
-version := "1.0.0"
-
-licenses := Seq("MIT License" -> url("https://opensource.org/licenses/MIT"))
-
-homepage := Some(url("https://github.com/janjaali/spray-jwt"))
-
-scmInfo := Some(
-  ScmInfo(
-    url("https://github.com/janjaali/spray-jwt"),
-    "scm:[email protected]/janjaali/spray-jwt.git"
-  )
-)
-
-developers := List(
-  Developer(
-    id = "ghashange",
-    name = "ghashange",
-    email = "",
-    url = url("https://github.com/janjaali")
+ThisBuild / scalaVersion := "3.0.0-RC3"
+
+ThisBuild / versionScheme := Some("early-semver")
+
+lazy val sprayJwt = (project in file("spray-jwt"))
+  .settings(
+    name := "spray-jwt",
+    organization := "com.github.janjaali",
+    version := "1.0.0",
+
+    licenses := Seq(
+      "MIT License" -> url("https://opensource.org/licenses/MIT")
+    ),
+    homepage := Some(url("https://github.com/janjaali/spray-jwt")),
+    scmInfo := Some(
+      ScmInfo(
+        browseUrl = url("https://github.com/janjaali/spray-jwt"),
+        connection = "scm:[email protected]/janjaali/spray-jwt.git"
+      )
+    ),
+    developers := List(
+      Developer(
+        id = "janjaali",
+        name = "janjaali",
+        email = "",
+        url = url("https://github.com/janjaali")
+      )
+    ),
+
+    publishMavenStyle := true,
+    publishTo := {
+      val nexus = "https://oss.sonatype.org/"
+      if (isSnapshot.value) {
+        Some("snapshots" at nexus + "content/repositories/snapshots")
+      } else {
+        Some("releases" at nexus + "service/local/staging/deploy/maven2")
+      }
+    },
+
+    libraryDependencies ++= Seq(
+      // JSON
+      ("io.spray" %% "spray-json" % "1.3.6").cross(CrossVersion.for3Use2_13),
+      // Encryption
+      "org.bouncycastle" % "bcpkix-jdk15on" % "1.58",
+      // Test
+      "org.scalatest" %% "scalatest" % "3.2.8" % Test,
+      // Property based tests
+      "org.scalacheck" %% "scalacheck" % "1.15.3" % Test,
+      "org.scalatestplus" %% "scalacheck-1-15" % "3.2.8.0" % Test
+    )
   )
-)
-
-scalaVersion := "2.12.3"
-
-publishMavenStyle := true
 
-publishArtifact in Test := false
-
-publishTo := {
-  val nexus = "https://oss.sonatype.org/"
-  if (isSnapshot.value) {
-    Some("snapshots" at nexus + "content/repositories/snapshots")
-  } else {
-    Some("releases" at nexus + "service/local/staging/deploy/maven2")
+lazy val sprayJsonSupport = (project in file("spray-json-support"))
+  .dependsOn(sprayJwt % "test->test;compile->compile")
+  .settings {
+    libraryDependencies ++= Seq(
+      // Supported JSON library
+      ("io.spray" %% "spray-json" % "1.3.6").cross(CrossVersion.for3Use2_13)
+    )
   }
-}
-
-val testDependencies = Seq(
-  "org.scalatest" %% "scalatest" % "3.0.4" % "test"
-)
-
-val dependencies = Seq(
-  "io.spray" %% "spray-json" % "1.3.3",
-  "org.bouncycastle" % "bcpkix-jdk15on" % "1.58"
-)
-
-libraryDependencies ++= dependencies
-libraryDependencies ++= testDependencies
-
-lazy val scalastyleTest = taskKey[Unit]("scalastyleTest")
-scalastyleTest := (scalastyle in Test).toTask("").value
-
-(scalastyle in Compile) := ((scalastyle in Compile) dependsOn scalastyleTest).toTask("").value
-
-lazy val installGitHook = taskKey[Unit]("Installs git hooks")
-installGitHook := {
-  if (sys.props("os.name").contains("Windows")) {
-    "cmd /c copy scripts\\pre-commit-hook.sh .git\\hooks\\pre-commit" !
-  } else {
-    "cp scripts/pre-commit-hook.sh .git/hooks/pre-commit" !
-  }
-}
-
-(compile in Compile) := ((compile in Compile) dependsOn installGitHook).value

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.0.2
+sbt.version = 1.5.1