Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple version bumps, extracted version values and gradle upgrade. #36

Merged
merged 1 commit into from
May 5, 2020
Merged

Multiple version bumps, extracted version values and gradle upgrade. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/g8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ configurations {

dependencies {

compile 'com.typesafe.akka:akka-discovery_$scala_major_version$:$akka_version$'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe do the versions += [ ScalaBinary... thing here?
If we want to keep gradle around...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do in a separate PR.

I'm trying to align both g8 templates first.

compile 'com.typesafe.akka:akka-protobuf_$scala_major_version$:$akka_version$'
compile 'com.typesafe.akka:akka-stream_$scala_major_version$:$akka_version$'

testImplementation 'com.typesafe.akka:akka-stream-testkit_2.12:$akka_version$'
testImplementation 'org.scalatest:scalatest_2.12:3.0.8'
testRuntime 'org.pegdown:pegdown:1.1.0'
Expand Down Expand Up @@ -68,3 +72,7 @@ task runClient(type: JavaExec) {
if (project.hasProperty("GreeterClient.user"))
args project.getProperty("GreeterClient.user")
}

application {
mainClassName = 'com.example.helloworld.GreeterServer'
}
2 changes: 1 addition & 1 deletion src/main/g8/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ enablePlugins(AkkaGrpcPlugin)

// ALPN agent
enablePlugins(JavaAgent)
javaAgents += "org.mortbay.jetty.alpn" % "jetty-alpn-agent" % "2.0.10" % "runtime;test"
javaAgents += "org.mortbay.jetty.alpn" % "jetty-alpn-agent" % "$jetty_alpn_agent_version$" % "runtime;test"

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-discovery" % akkaVersion,
Expand Down
7 changes: 5 additions & 2 deletions src/main/g8/default.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name = akka-grpc-quickstart-scala
description = Akka gRPC is a toolkit for building streaming gRPC servers and clients on top of Akka Streams. This simple application will get you started building gRPC based systems with Scala. This app uses Akka, Scala, and ScalaTest.
akka_grpc_version=maven(com.lightbend.akka.grpc, akka-grpc-runtime_2.12)
akka_grpc_version=maven(com.lightbend.akka.grpc, akka-grpc-runtime_2.13, stable)
akka_version=maven(com.typesafe.akka, akka-actor_2.13, stable)
scala_version=2.13.1
sbt_version=maven(org.scala-sbt, sbt)
jetty_alpn_agent_version=maven(org.mortbay.jetty.alpn, jetty-alpn-agent, stable)
scala_major_version=2.13
scala_version=2.13.2
verbatim=*.scala *.conf *.proto *.pem *.key gradlew gradlew.bat gradle-wrapper.properties gradle-wrapper.jar
12 changes: 7 additions & 5 deletions src/main/g8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@
<maven.compiler.target>1.8</maven.compiler.target>
<akka.version>$akka_version$</akka.version>
<akka.grpc.version>$akka_grpc_version$</akka.grpc.version>
<grpc.version>1.13.1</grpc.version>
<scala.binary.version>$scala_major_version$</scala.binary.version>
<jetty.alpn.agent.version>$jetty_alpn_agent_version$</jetty.alpn.agent.version>
<grpc.version>1.28.1</grpc.version>
<project.encoding>UTF-8</project.encoding>
</properties>

<dependencies>
<dependency>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>akka-grpc-runtime_2.12</artifactId>
<artifactId>akka-grpc-runtime_\${scala.binary.version}</artifactId>
<version>\${akka.grpc.version}</version>
</dependency>

<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-stream-testkit_2.12</artifactId>
<artifactId>akka-stream-testkit_\${scala.binary.version}</artifactId>
<version>\${akka.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.12</artifactId>
<artifactId>scalatest_\${scala.binary.version}</artifactId>
<version>3.0.5</version>
<scope>test</scope>
</dependency>
Expand All @@ -48,7 +50,7 @@
<dependency>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>jetty-alpn-agent</artifactId>
<version>2.0.7</version>
<version>\${jetty.alpn.agent.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.8
sbt.version=$sbt_version$