Skip to content

Commit 191a97b

Browse files
committed
Bump up versions
1 parent e4e0254 commit 191a97b

File tree

5 files changed

+17
-31
lines changed

5 files changed

+17
-31
lines changed

build.sbt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,28 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
22

33
javacOptions ++= List("-target", "8", "-source", "8")
44

5-
sonatypeProfileName := "com.thesamet"
6-
7-
sonatypeBundleDirectory := (ThisBuild / baseDirectory).value / "target" / "sonatype-staging"
8-
95
publish / skip := true
106

117
def commonProtos =
128
ProtosProject(
13-
"com.google.api.grpc" % "proto-google-common-protos" % "2.9.6",
9+
"com.google.api.grpc" % "proto-google-common-protos" % "2.61.0",
1410
grpc = true,
1511
protoPackage = "google",
1612
buildNumber = 0
1713
)
18-
lazy val commonProtos09 = commonProtos.scalapb09
1914
lazy val commonProtos10 = commonProtos.scalapb10
2015
lazy val commonProtos11 = commonProtos.scalapb11
16+
lazy val commonProtos1 = commonProtos.scalapb1
2117

2218
val cloudPubSub = ProtosProject(
23-
"com.google.api.grpc" % "proto-google-cloud-pubsub-v1" % "1.102.20",
19+
"com.google.api.grpc" % "proto-google-cloud-pubsub-v1" % "1.123.3",
2420
grpc = true,
2521
protoPackage = "google",
2622
buildNumber = 0
2723
).dependsOn(commonProtos)
28-
lazy val cloudPubSub09 = cloudPubSub.scalapb09
2924
lazy val cloudPubSub10 = cloudPubSub.scalapb10
3025
lazy val cloudPubSub11 = cloudPubSub.scalapb11
26+
lazy val cloudPubSub1 = cloudPubSub.scalapb1
3127

3228
val pgvProto = ProtosProject(
3329
"build.buf.protoc-gen-validate" % "pgv-java-stub" % "0.6.13",
@@ -36,6 +32,6 @@ val pgvProto = ProtosProject(
3632
packageName = Some("pgv-proto"),
3733
buildNumber = 0
3834
)
39-
lazy val pgvProto09 = pgvProto.scalapb09
4035
lazy val pgvProto10 = pgvProto.scalapb10
4136
lazy val pgvProto11 = pgvProto.scalapb11
37+
lazy val pgvProto1 = pgvProto.scalapb1

project/BuildHelpers.scala

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import sbt._
22
import Keys._
33
import sbtprotoc.ProtocPlugin.autoImport.PB
44
import scala.sys.process.{ProcessLogger, Process}
5-
import xerial.sbt.Sonatype.autoImport.sonatypeBundleDirectory
65

76
object NoProcessLogger extends ProcessLogger {
87
def info(s: => String) = ()
@@ -40,9 +39,9 @@ final case class ProtosProject(
4039
else s"${module.revision}-${buildNumber}"
4140
},
4241
crossScalaVersions := (scalapbMajorMinor match {
43-
case "0.9" => List(Scala213, Scala212, Scala211)
4442
case "0.10" => List(Scala213, Scala212)
4543
case "0.11" => List(Scala3, Scala213, Scala212)
44+
case "1.0" => List(Scala3, Scala213, Scala212)
4645
}),
4746
versionTag := s"${basePackageName}/${module.revision}-${buildNumber}",
4847
libraryDependencies ++= (if (grpc)
@@ -69,7 +68,6 @@ final case class ProtosProject(
6968
createTags := createTagsImpl.value,
7069
publish / skip := (sys.env
7170
.getOrElse("PUBLISH_ONLY", basePackageName) != basePackageName),
72-
sonatypeBundleDirectory := (ThisBuild / baseDirectory).value / "target" / "sonatype-staging",
7371
Compile / resourceGenerators += Def.task {
7472

7573
val packageOptionsFile =
@@ -104,21 +102,21 @@ final case class ProtosProject(
104102
)
105103
}
106104

107-
def scalapb09: Project =
108-
protoProject("0.9.8").dependsOn(
109-
dependencies.map(d => ClasspathDependency(d.scalapb09, None)): _*
110-
)
111-
112105
val scalapb10: Project =
113106
protoProject("0.10.11").dependsOn(
114107
dependencies.map(d => ClasspathDependency(d.scalapb10, None)): _*
115108
)
116109

117110
val scalapb11: Project =
118-
protoProject("0.11.5").dependsOn(
111+
protoProject("0.11.20").dependsOn(
119112
dependencies.map(d => ClasspathDependency(d.scalapb11, None)): _*
120113
)
121114

115+
val scalapb1: Project =
116+
protoProject("1.0.0-alpha.2").dependsOn(
117+
dependencies.map(d => ClasspathDependency(d.scalapb1, None)): _*
118+
)
119+
122120
def dependsOn(other: ProtosProject) =
123121
copy(dependencies = dependencies :+ other)
124122
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.5
1+
sbt.version=1.11.4

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.4")
1+
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.8")
22

3-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
3+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
44

5-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
5+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")

sonatype.sbt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
sonatypeProfileName := "com.thesamet"
2-
3-
// Where is the source code hosted: GitHub or GitLab?
4-
import xerial.sbt.Sonatype._
5-
61
inThisBuild(
72
List(
83
organization := "com.thesamet.scalapb.common-protos",
@@ -17,9 +12,6 @@ inThisBuild(
1712
licenses := Seq(
1813
"APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")
1914
),
20-
homepage := Some(url("https://github.com/scalapb/common-protos")),
21-
sonatypeProjectHosting := Some(
22-
GitHubHosting("scalapb", "common-protos", "[email protected]")
23-
)
15+
homepage := Some(url("https://github.com/scalapb/common-protos"))
2416
)
2517
)

0 commit comments

Comments
 (0)