diff --git a/build.sbt b/build.sbt index 7ffe2e39..1f4ead72 100644 --- a/build.sbt +++ b/build.sbt @@ -16,6 +16,8 @@ import org.apache.pekko.grpc.build.ReflectiveCodeGen import com.typesafe.tools.mima.core._ import sbt.Keys.scalaVersion +// pekkoInlineEnabled should be set to true when we start building 1.1.x builds +ThisBuild / pekkoInlineEnabled := false ThisBuild / apacheSonatypeProjectProfile := "pekko" sourceDistName := "apache-pekko-grpc" sourceDistIncubating := true diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4b33ecf1..b02a28d5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,6 @@ package org.apache.pekko.grpc import sbt._ import sbt.Keys._ import buildinfo.BuildInfo -import com.github.pjfanning.pekkobuild.{ PekkoDependency, PekkoHttpDependency } object Dependencies { object Versions { @@ -28,9 +27,9 @@ object Dependencies { // We don't force Pekko updates because downstream projects can upgrade // themselves. For more information see // https://pekko.apache.org//docs/pekko/current/project/downstream-upgrade-strategy.html - val pekko = PekkoDependency.pekkoVersion + val pekko = PekkoCoreDependency.version val pekkoBinary = pekko.take(3) - val pekkoHttp = PekkoHttpDependency.pekkoHttpVersion + val pekkoHttp = PekkoHttpDependency.version val pekkoHttpBinary = pekkoHttp.take(3) val grpc = "1.54.2" // checked synced by VersionSyncCheckPlugin diff --git a/project/PekkoCoreDependency.scala b/project/PekkoCoreDependency.scala new file mode 100644 index 00000000..b53552c2 --- /dev/null +++ b/project/PekkoCoreDependency.scala @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.pekko.grpc + +import com.github.pjfanning.pekkobuild.PekkoDependency + +object PekkoCoreDependency extends PekkoDependency { + override val checkProject: String = "pekko-cluster-sharding-typed" + override val module: Option[String] = None + override val currentVersion: String = "1.0.2" +} diff --git a/project/PekkoHttpDependency.scala b/project/PekkoHttpDependency.scala new file mode 100644 index 00000000..354aa8e4 --- /dev/null +++ b/project/PekkoHttpDependency.scala @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.pekko.grpc + +import com.github.pjfanning.pekkobuild.PekkoDependency + +object PekkoHttpDependency extends PekkoDependency { + override val checkProject: String = "pekko-http-testkit" + override val module: Option[String] = Some("http") + override val currentVersion: String = "1.0.0" +} diff --git a/project/plugins.sbt b/project/plugins.sbt index f52247a7..36472cbd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,8 +14,8 @@ val sbtProtocV = "1.0.6" buildInfoKeys := Seq[BuildInfoKey]("sbtProtocVersion" -> sbtProtocV) addSbtPlugin("lt.dvim.authors" % "sbt-authors" % "1.3") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % sbtProtocV) addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.3") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") @@ -26,7 +26,7 @@ addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10") -addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.2.0") +addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.0") addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.11") addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")