Skip to content
This repository has been archived by the owner on Jul 30, 2024. It is now read-only.

Update Project Dependencies #197

Merged
merged 5 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.11, 2.13.4]
scala: [2.12.14, 2.13.7]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down Expand Up @@ -71,4 +71,4 @@ jobs:
run: sbt ++${{ matrix.scala }} coverageReport coverageAggregate coveralls

- name: Shut down Nakadi
run: docker-compose down
run: docker-compose down
2 changes: 1 addition & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ jobs:
printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
ghapi -X DELETE $REPO/actions/artifacts/$id
done
done
done
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
- name: Check project is formatted
uses: jrouly/scalafmt-native-action@v1
with:
version: '3.0.0'
version: '3.1.2'
3 changes: 2 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version = 3.0.0
version = 3.1.2
runner.dialect = scala212source3
style = defaultWithAlign
maxColumn = 120
project.git = true
Expand Down
32 changes: 17 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name := """kanadi"""

val akkaHttpVersion = "10.2.2"
val akkaStreamsJsonVersion = "0.7.0"
val currentScalaVersion = "2.12.11"
val scala213Version = "2.13.4"
val enumeratumCirceVersion = "1.5.23"
val circeVersion = "0.13.0"
val akkaVersion = "2.6.10"
val specs2Version = "4.8.0"
val heikoseebergerAkkaHttpCirceVersion = "1.35.3"
val scala212Version = "2.12.14"
val scala213Version = "2.13.7"
val currentScalaVersion = scala212Version

val akkaHttpVersion = "10.2.7"
val akkaStreamsJsonVersion = "0.8.0"
val enumeratumCirceVersion = "1.7.0"
val circeVersion = "0.14.1"
val akkaVersion = "2.6.17"
val specs2Version = "4.13.0"
val heikoseebergerAkkaHttpCirceVersion = "1.38.2"

ThisBuild / scalaVersion := currentScalaVersion

Expand Down Expand Up @@ -48,7 +50,7 @@ scalacOptions ++= Seq(
"-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
"-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
"-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
//"-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
// "-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
"-Ywarn-dead-code", // Warn when dead code is identified.
"-Ywarn-numeric-widen", // Warn when numerics are widened.
"-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
Expand Down Expand Up @@ -86,16 +88,16 @@ libraryDependencies ++= {
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion % Provided,
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion % Provided,
"com.typesafe.akka" %% "akka-stream" % akkaVersion % Provided,
"org.mdedetrich" %% "censored-raw-header" % "0.5.0",
"org.mdedetrich" %% "webmodels" % "0.8.1",
"org.mdedetrich" %% "censored-raw-header" % "0.7.0",
"org.mdedetrich" %% "webmodels" % "0.9.1",
"com.beachape" %% "enumeratum-circe" % enumeratumCirceVersion,
"io.circe" %% "circe-parser" % circeVersion,
"org.mdedetrich" %% "akka-stream-circe" % akkaStreamsJsonVersion,
"org.mdedetrich" %% "akka-http-circe" % akkaStreamsJsonVersion,
"de.heikoseeberger" %% "akka-http-circe" % heikoseebergerAkkaHttpCirceVersion,
"com.iheart" %% "ficus" % "1.4.7",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
"ch.qos.logback" % "logback-classic" % "1.1.7",
"com.iheart" %% "ficus" % "1.5.1",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
"ch.qos.logback" % "logback-classic" % "1.2.7",
"org.specs2" %% "specs2-core" % specs2Version % Test
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n == 13 =>
Expand Down
22 changes: 8 additions & 14 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")

addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")

addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")

addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0")

addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
2 changes: 0 additions & 2 deletions src/main/scala/org/zalando/kanadi/api/Events.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.RawHeader
import akka.http.scaladsl.unmarshalling.Unmarshal
import akka.stream.Materializer
import cats.syntax.either._
import com.typesafe.scalalogging.{Logger, LoggerTakingImplicit}
import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
import enumeratum._
Expand All @@ -24,7 +23,6 @@ import org.zalando.kanadi.models._

import scala.concurrent.{ExecutionContext, Future}
import scala.concurrent.duration._
import scala.language.postfixOps

sealed abstract class Event[T](val data: T) {
def getMetadata: Option[Metadata] = this match {
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/org/zalando/kanadi/api/Registry.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.zalando.kanadi.api

import java.net.URI

import defaults._
import akka.http.scaladsl.HttpExt
import akka.http.scaladsl.model.headers.RawHeader
import akka.http.scaladsl.model.{ContentTypes, HttpMethods, HttpRequest, Uri}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import akka.http.scaladsl.unmarshalling.Unmarshal
import akka.stream._
import akka.stream.scaladsl._
import akka.util.ByteString
import cats.syntax.either._
import com.typesafe.scalalogging.{Logger, LoggerTakingImplicit}
import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
import enumeratum._
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/org/zalando/kanadi/api/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import akka.http.scaladsl.model.headers._
import akka.http.scaladsl.model.{HttpEntity, HttpHeader, HttpRequest, HttpResponse}
import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
import akka.stream.Materializer
import cats.syntax.either._
import com.typesafe.scalalogging.CanLog
import io.circe._
import org.mdedetrich.webmodels.RequestHeaders.`X-Flow-ID`
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/org/zalando/kanadi/package.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.zalando

import java.net.URI
import cats.syntax.either._
import io.circe.Decoder.Result
import io.circe.syntax._
import io.circe.{Decoder, DecodingFailure, Encoder, HCursor}
Expand Down