diff --git a/build.sbt b/build.sbt index e9b59be..f3ed6f5 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,7 @@ name := "scala-openrtb" version in ThisBuild := "1.4.0" + scalaVersion in ThisBuild := "2.13.1" crossScalaVersions in ThisBuild := Seq("2.12.10", "2.13.1") organization in ThisBuild := "com.powerspace.openrtb" @@ -14,7 +15,6 @@ scalacOptions in ThisBuild := Seq( "-deprecation", "-encoding", "utf8", - "-opt:l:default,l:inline,l:method", "-unchecked", "-Ywarn-dead-code", "-Ywarn-numeric-widen", @@ -26,6 +26,12 @@ scalacOptions in ThisBuild := Seq( publishArtifact in root := false +val resolutionSettings = Seq( + githubTokenSource := TokenSource.Or(TokenSource.Environment("GITHUB_TOKEN"), TokenSource.GitConfig("github.token")), + githubOwner := "valdo404", + githubRepository := "scala-openrtb" +) + val testSettings = Seq( libraryDependencies ++= Seq( "org.scalactic" %% "scalactic" % "3.0.8" % "test", @@ -36,28 +42,34 @@ val testSettings = Seq( // OpenRTB Scala model lazy val openRtbModel = Project(id = "openrtb-model", base = file("openrtb-model")) .settings(testSettings: _*) + .settings(resolutionSettings: _*) // OpenRTB JSON Serialization & Deserialization lazy val openRtbJson = Project(id = "openrtb-json", base = file("openrtb-json")) .dependsOn(openRtbModel) + .settings(resolutionSettings: _*) // BidSwitch Scala model lazy val bidswitchModel = Project(id = "bidswitch-model", base = file("bidswitch-model")) .dependsOn(openRtbModel % "compile->compile;test->test") + .settings(resolutionSettings: _*) // BidSwitch JSON Serialization & Deserialization lazy val bidswitchJson = Project(id = "bidswitch-json", base = file("bidswitch-json")) .dependsOn(bidswitchModel % "compile->compile;test->test", openRtbJson % "compile->compile;test->test") .settings(testSettings: _*) + .settings(resolutionSettings: _*) // Akka Http marshallers and unmarshallers lazy val akkaHttpMarshaller = Project(id = "akka-http-marshallers", base = file("akka-http-marshallers")) .dependsOn(openRtbJson) + .settings(resolutionSettings: _*) // scala-openrtb examples lazy val examples = Project(id = "examples", base = file("examples")) .dependsOn(openRtbJson % "compile->compile;test->test") .settings(skip in publish := true) + .settings(resolutionSettings: _*) lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks")) .enablePlugins(JmhPlugin) @@ -66,6 +78,7 @@ lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks")) examples ) .settings(skip in publish := true) + .settings(resolutionSettings: _*) lazy val root = (project in file(".")) .aggregate( @@ -77,3 +90,5 @@ lazy val root = (project in file(".")) examples, benchmarks ) + .settings(resolutionSettings: _*) + diff --git a/project/build.properties b/project/build.properties index d18a12e..97a7ea7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.4.7 +sbt.version = 1.4.7 \ No newline at end of file diff --git a/project/release.sbt b/project/release.sbt new file mode 100644 index 0000000..1a65d3f --- /dev/null +++ b/project/release.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.2") diff --git a/publish.sbt b/publish.sbt index 2294e0b..234b3cd 100644 --- a/publish.sbt +++ b/publish.sbt @@ -1,17 +1,16 @@ import sbt.url -sonatypeProfileName in ThisBuild := "com.powerspace" - publishMavenStyle in ThisBuild := true +publishConfiguration in ThisBuild := publishConfiguration.value.withOverwrite(true) licenses in ThisBuild := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) -homepage in ThisBuild := Some(url("https://github.com/Powerspace/scala-openrtb")) +homepage in ThisBuild := Some(url("https://github.com/valdo404/scala-openrtb")) scmInfo in ThisBuild := Some( ScmInfo( - url("https://github.com/Powerspace/scala-openrtb"), - "scm:git@github.com:Powerspace/scala-openrtb.git" + url("https://github.com/valdo404/scala-openrtb"), + "scm:git@github.com:valdo404/scala-openrtb.git" ) ) @@ -38,8 +37,5 @@ developers in ThisBuild := List( url = url("https://github.com/Garnek20")) ) -pomIncludeRepository in ThisBuild := { _ => - false -} -publishTo in ThisBuild := sonatypePublishToBundle.value +pomIncludeRepository in ThisBuild:= { _ => false } publishMavenStyle in ThisBuild := true