Skip to content

Commit 222b986

Browse files
authored
Merge pull request #47 from valdo404/upgrade-dependencies
chore: upgrade dependencies
2 parents e1daa77 + afc54fe commit 222b986

File tree

10 files changed

+27
-14
lines changed

10 files changed

+27
-14
lines changed

bidswitch-json/src/test/scala/com/powerspace/openrtb/bidswitch/fixtures/BidRequestFixtures.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ object BidRequestFixtures {
7373
val device = getDevice
7474
val bidRequest = BidRequest(
7575
id = "fmySKZNcTFcTPOurFYivufGxMtuSYpen",
76-
at = Some(AuctionType.fromValue(value = 2)),
76+
at = Some(AuctionType.fromValue(2)),
7777
imp = Seq(extendedImpression),
7878
cur = Seq("EUR"),
7979
device = Some(device),

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "scala-openrtb"
22

3-
version in ThisBuild := "1.3.1"
3+
version in ThisBuild := "1.4.0"
44

55
scalaVersion in ThisBuild := "2.13.1"
66
crossScalaVersions in ThisBuild := Seq("2.12.10", "2.13.1")

examples/build.sbt

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ libraryDependencies ++= Seq(
1919
"com.typesafe.akka" %% "akka-http-core" % akkaHttpVersion,
2020
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
2121
"de.heikoseeberger" %% "akka-http-circe" % akkaHttpJsonVersion,
22-
"io.monix" %% "monix" % monixVersion
23-
)
22+
"io.monix" %% "monix" % monixVersion,
23+
"com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
24+
)

examples/src/main/protobuf/example.proto

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ syntax = "proto2";
22
import "openrtb.proto";
33
package com.powerspace.openrtb.example;
44

5+
import "scalapb/scalapb.proto";
6+
7+
option (scalapb.options) = {
8+
scope: FILE
9+
flat_package: true
10+
lenses: true
11+
preserve_unknown_fields: false
12+
};
13+
514
message ImpExt {
615
optional string bidFeedback = 1;
716
}

openrtb-json/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val circeVersion = "0.12.1"
1+
val circeVersion = "0.13.0"
22

33
libraryDependencies ++= Seq(
44
"io.circe" %% "circe-core",
@@ -9,4 +9,4 @@ libraryDependencies ++= Seq(
99

1010
libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.8" % "test"
1111
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % "test"
12-
libraryDependencies += "org.gnieh" %% "diffson-circe" % "4.0.0" % "test"
12+
libraryDependencies += "org.gnieh" %% "diffson-circe" % "4.0.3" % "test"

openrtb-json/src/test/scala/com/powerspace/openrtb/json/fixtures/BidRequestFixtures.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ object BidRequestFixtures {
7575
else RequestOneof.Request("native-string")
7676
BidRequest(
7777
id = "fmySKZNcTFcTPOurFYivufGxMtuSYpen",
78-
at = Some(AuctionType.fromValue(value = 2)),
78+
at = Some(AuctionType.fromValue(2)),
7979
imp = Seq(getImpression(requestOneof)),
8080
cur = Seq("EUR"),
8181
device = Some(getDevice),

openrtb-model/build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ libraryDependencies ++= Seq(
55
"com.github.julien-truffaut" %% "monocle-core" % monocleVersion,
66
"com.github.julien-truffaut" %% "monocle-macro" % monocleVersion,
77
"com.github.julien-truffaut" %% "monocle-law" % monocleVersion % "test",
8-
"com.chuusai" %% "shapeless" % "2.3.3"
8+
"com.chuusai" %% "shapeless" % "2.3.3",
9+
"com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
910
)
1011

1112
PB.targets in Compile := Seq(

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.3.0
1+
sbt.version = 1.4.7

project/protoc.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.23")
2-
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.0"
1+
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.1")
2+
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.11"

publish.sbt

+5-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ developers in ThisBuild := List(
3838
url = url("https://github.com/Garnek20"))
3939
)
4040

41-
pomIncludeRepository in ThisBuild := { _ =>
42-
false
41+
pomIncludeRepository in ThisBuild:= { _ => false }
42+
publishTo in ThisBuild := {
43+
val nexus = "https://oss.sonatype.org/"
44+
if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots")
45+
else Some("releases" at nexus + "service/local/staging/deploy/maven2")
4346
}
44-
publishTo in ThisBuild := sonatypePublishToBundle.value
4547
publishMavenStyle in ThisBuild := true

0 commit comments

Comments
 (0)