Merge pull request #47 from valdo404/upgrade-dependencies

chore: upgrade dependencies
Powerspace · Mar 3, 2021 · 222b986 · 222b986
2 parents e1daa77 + afc54fe
commit 222b986
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 14 deletions.
diff --git a/...ch-json/src/test/scala/com/powerspace/openrtb/bidswitch/fixtures/BidRequestFixtures.scala b/...ch-json/src/test/scala/com/powerspace/openrtb/bidswitch/fixtures/BidRequestFixtures.scala
@@ -73,7 +73,7 @@ object BidRequestFixtures {
     val device = getDevice
     val bidRequest = BidRequest(
       id = "fmySKZNcTFcTPOurFYivufGxMtuSYpen",
-      at = Some(AuctionType.fromValue(value = 2)),
+      at = Some(AuctionType.fromValue(2)),
       imp = Seq(extendedImpression),
       cur = Seq("EUR"),
       device = Some(device),

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "scala-openrtb"
 
-version in ThisBuild := "1.3.1"
+version in ThisBuild := "1.4.0"
 
 scalaVersion in ThisBuild       := "2.13.1"
 crossScalaVersions in ThisBuild := Seq("2.12.10", "2.13.1")

diff --git a/examples/build.sbt b/examples/build.sbt
@@ -19,5 +19,6 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-http-core"      % akkaHttpVersion,
   "com.typesafe.akka" %% "akka-http"           % akkaHttpVersion,
   "de.heikoseeberger" %% "akka-http-circe"     % akkaHttpJsonVersion,
-  "io.monix"          %% "monix"               % monixVersion
-)
+  "io.monix"          %% "monix"               % monixVersion,
+  "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
+)
diff --git a/examples/src/main/protobuf/example.proto b/examples/src/main/protobuf/example.proto
@@ -2,6 +2,15 @@ syntax = "proto2";
 import "openrtb.proto";
 package com.powerspace.openrtb.example;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+    scope: FILE
+    flat_package: true
+    lenses: true
+    preserve_unknown_fields: false
+};
+
 message ImpExt {
     optional string bidFeedback = 1;
 }

diff --git a/openrtb-json/build.sbt b/openrtb-json/build.sbt
@@ -1,4 +1,4 @@
-val circeVersion = "0.12.1"
+val circeVersion = "0.13.0"
 
 libraryDependencies ++= Seq(
   "io.circe" %% "circe-core",
@@ -9,4 +9,4 @@ libraryDependencies ++= Seq(
 
 libraryDependencies += "org.scalactic" %% "scalactic"     % "3.0.8" % "test"
 libraryDependencies += "org.scalatest" %% "scalatest"     % "3.0.8" % "test"
-libraryDependencies += "org.gnieh"     %% "diffson-circe" % "4.0.0" % "test"
+libraryDependencies += "org.gnieh"     %% "diffson-circe" % "4.0.3" % "test"
diff --git a/openrtb-json/src/test/scala/com/powerspace/openrtb/json/fixtures/BidRequestFixtures.scala b/openrtb-json/src/test/scala/com/powerspace/openrtb/json/fixtures/BidRequestFixtures.scala
@@ -75,7 +75,7 @@ object BidRequestFixtures {
     else RequestOneof.Request("native-string")
     BidRequest(
       id = "fmySKZNcTFcTPOurFYivufGxMtuSYpen",
-      at = Some(AuctionType.fromValue(value = 2)),
+      at = Some(AuctionType.fromValue(2)),
       imp = Seq(getImpression(requestOneof)),
       cur = Seq("EUR"),
       device = Some(getDevice),

diff --git a/openrtb-model/build.sbt b/openrtb-model/build.sbt
@@ -5,7 +5,8 @@ libraryDependencies ++= Seq(
   "com.github.julien-truffaut" %% "monocle-core"  % monocleVersion,
   "com.github.julien-truffaut" %% "monocle-macro" % monocleVersion,
   "com.github.julien-truffaut" %% "monocle-law"   % monocleVersion % "test",
-  "com.chuusai"                %% "shapeless"     % "2.3.3"
+  "com.chuusai"                %% "shapeless"     % "2.3.3",
+  "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
 )
 
 PB.targets in Compile := Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.3.0
+sbt.version = 1.4.7
diff --git a/project/protoc.sbt b/project/protoc.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.23")
-libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.0"
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.1")
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.11"
diff --git a/publish.sbt b/publish.sbt
@@ -38,8 +38,10 @@ developers in ThisBuild := List(
     url = url("https://github.com/Garnek20"))
 )
 
-pomIncludeRepository in ThisBuild := { _ =>
-  false
+pomIncludeRepository  in ThisBuild:= { _ => false }
+publishTo in ThisBuild := {
+  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")
 }
-publishTo in ThisBuild := sonatypePublishToBundle.value
 publishMavenStyle in ThisBuild := true