Skip to content

Commit b3d47b0

Browse files
authored
chore: License change and sample bump for 2.5.8 (#2092)
Also: sure samples are actually tested with the local snapshot, fix version align check
1 parent 34b8210 commit b3d47b0

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

.github/workflows/native-image-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Akka gRPC Scala native image test app build
5353
run: |-
5454
cd native-image-tests/grpc-scala
55-
sbt nativeImage -Dakka.grpc.version=`cat ~/.version`
55+
sbt nativeImage -Dakka-grpc.version=`cat ~/.version`
5656
# run the binary, netty client backend
5757
target/native-image/grpc-scala
5858
# akka-http client backend

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Business Source License 1.1
33
Parameters
44

55
Licensor: Lightbend, Inc.
6-
Licensed Work: Akka gRPC 2.5.7
6+
Licensed Work: Akka gRPC 2.5.8
77
This license applies to all sub directories and files
88
UNLESS another license file is present in a sub
99
directory, then that other license applies to all files
@@ -19,12 +19,12 @@ Additional Use Grant:
1919
Connecting to a Play Framework websocket and/or Play Framework
2020
request/response bodies for server and play-ws client.
2121

22-
Change Date: 2028-08-21
22+
Change Date: 2028-10-29
2323

2424
Change License: Apache License, Version 2.0
2525

2626
For information about alternative licensing arrangements for the Software,
27-
please visit: https://lightbend.com/
27+
please visit: https://akka.io
2828

2929
-----------------------------------------------------------------------------
3030

native-image-tests/grpc-scala/build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ version := "1.0"
55
scalaVersion := "2.13.17"
66

77
lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.11")
8-
lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.5.4")
98

109
enablePlugins(AkkaGrpcPlugin)
1110
// GraalVM native image build
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
22

3-
lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.5.4")
3+
lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.8")
44
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % akkaGrpcVersion)
55
addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.3.4")

project/VersionSyncCheckPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object VersionSyncCheckPlugin extends AutoPlugin {
2323
grpcVersionSyncCheck := versionSyncCheckImpl(
2424
"gRPC",
2525
Dependencies.Versions.grpc,
26-
raw"""(?i)grpc.?(?i)version.{1,9}(\d+\.\d+\.\d+)""".r.unanchored,
26+
raw"""(?i)(?<!akka.)grpc.?(?i)version.{1,9}(\d+\.\d+\.\d+)""".r.unanchored,
2727
Seq(
2828
Paths.get("plugin-tester-java/pom.xml"),
2929
Paths.get("plugin-tester-scala/pom.xml"),

samples/akka-grpc-quickstart-java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
plugins {
1010
id 'java'
1111
id 'application'
12-
id 'com.lightbend.akka.grpc.gradle' version '2.5.7'
12+
id 'com.lightbend.akka.grpc.gradle' version '2.5.8'
1313
}
1414
repositories {
1515
mavenCentral()

samples/akka-grpc-quickstart-java/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version := "1.0"
33
scalaVersion := "2.13.17"
44

55
val akkaVersion = "2.10.11"
6-
lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.7")
6+
lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.8")
77

88
enablePlugins(AkkaGrpcPlugin)
99

samples/akka-grpc-quickstart-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<maven.compiler.source>17</maven.compiler.source>
1313
<maven.compiler.target>17</maven.compiler.target>
1414
<akka.version>2.10.11</akka.version>
15-
<akka-grpc.version>2.5.7</akka-grpc.version>
15+
<akka-grpc.version>2.5.8</akka-grpc.version>
1616
<scala.binary.version>2.13</scala.binary.version>
1717
<project.encoding>UTF-8</project.encoding>
1818
</properties>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resolvers += "Akka library repository".at("https://repo.akka.io/maven")
22

33
addSbtPlugin(
4-
"com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.7"
4+
"com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.8"
55
)

samples/akka-grpc-quickstart-scala/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
plugins {
1010
id 'java'
1111
id 'application'
12-
id 'com.lightbend.akka.grpc.gradle' version '2.5.7'
12+
id 'com.lightbend.akka.grpc.gradle' version '2.5.8'
1313
}
1414
repositories {
1515
mavenCentral()

0 commit comments

Comments
 (0)