From 4abdcffb78cf70ccb2cbd54a19bd70f27aba1f90 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 1 Feb 2019 07:34:28 +0000 Subject: [PATCH] Drop Scala 2.11 support --- .travis.yml | 2 +- CONTRIBUTING.md | 2 +- build.sbt | 11 +------ project/Dependencies.scala | 1 - .../gen-scala-server/03-cross-scala/build.sbt | 6 ---- .../03-cross-scala/project/plugins.sbt | 3 -- .../src/main/protobuf/helloworld.proto | 29 ------------------- .../gen-scala-server/03-cross-scala/test | 14 --------- 8 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/build.sbt delete mode 100644 sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/project/plugins.sbt delete mode 100644 sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/src/main/protobuf/helloworld.proto delete mode 100644 sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/test diff --git a/.travis.yml b/.travis.yml index 03a3633dd..d8cf14276 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ jobs: - stage: whitesource-release script: git branch -f "$TRAVIS_BRANCH" && git checkout "$TRAVIS_BRANCH" && sbt whitesourceCheckPolicies whitesourceUpdate - stage: publish - script: sbt "; ++2.11.12 publish ; ++2.12.8 publish" + script: sbt publish - script: openssl aes-256-cbc -K $encrypted_9c9c33071881_key -iv $encrypted_9c9c33071881_iv -in gradle.properties.enc -out ./gradle-plugin/gradle.properties -d && cd gradle-plugin && ./gradlew publishPlugins - stage: techhub-ping script: curl -I https://ci.lightbend.com/job/techhub-publisher/build?token=$TECH_HUB_TOKEN diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5c8aecc6..ec82b5074 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,7 +101,7 @@ rules: Binary compatibility rules and guarantees are described in depth in the [Binary Compatibility Rules ](http://doc.akka.io/docs/akka/snapshot/common/binary-compatibility-rules.html) section of the documentation. -Akka-http uses MiMa (which is short for [Lightbend Migration Manager](https://github.com/lightbend/migration-manager)) to +Akka HTTP uses MiMa (which is short for [Lightbend Migration Manager](https://github.com/lightbend/migration-manager)) to validate binary compatibility of incoming Pull Requests. If your PR fails due to binary compatibility issues, you may see an error like this: diff --git a/build.sbt b/build.sbt index c9bf5f985..2ebc93e50 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ import akka.grpc.Dependencies -import akka.grpc.Dependencies.Versions.{ scala211, scala212 } +import akka.grpc.Dependencies.Versions.scala212 import akka.grpc.ProjectExtensions._ import akka.grpc.build.ReflectiveCodeGen @@ -53,9 +53,6 @@ lazy val runtime = Project( ) .settings(Dependencies.runtime) .settings(commonSettings) - .settings( - crossScalaVersions := Seq(scala211, scala212) - ) /** This could be an independent project - or does upstream provide this already? didn't find it.. */ lazy val scalapbProtocPlugin = Project( @@ -108,12 +105,6 @@ lazy val sbtPlugin = Project( scriptedDependencies := { val p1 = publishLocal.value val p2 = (publishLocal in codegen).value - - // publish runtime for Scala 2.11 as well as some scripted tests use that - val extracted = Project.extract(state.value) - val differentScalaVersion = extracted.appendWithSession(List(scalaVersion in runtime := scala211), state.value) - extracted.runTask(publishLocal in runtime, differentScalaVersion) - val p3 = (publishLocal in runtime).value val p4 = (publishLocal in interopTests).value }, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ec3667f6b..75060719a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,6 @@ import sbt.Keys._ object Dependencies { object Versions { - val scala211 = "2.11.12" val scala212 = "2.12.8" val akka = "2.5.20" diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/build.sbt deleted file mode 100644 index dc6b5b27d..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/build.sbt +++ /dev/null @@ -1,6 +0,0 @@ -enablePlugins(JavaAgent) -enablePlugins(AkkaGrpcPlugin) - -javaAgents += "org.mortbay.jetty.alpn" % "jetty-alpn-agent" % "2.0.6" % "runtime" - -crossScalaVersions := Seq("2.11.12", "2.12.8") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/project/plugins.sbt deleted file mode 100644 index 3221cfdd5..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/project/plugins.sbt +++ /dev/null @@ -1,3 +0,0 @@ -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) - -addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.4") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/src/main/protobuf/helloworld.proto b/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/src/main/protobuf/helloworld.proto deleted file mode 100644 index 0f4426692..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/src/main/protobuf/helloworld.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "example.myapp.helloworld.grpc"; -option java_outer_classname = "HelloWorldProto"; - -package helloworld; - -// The greeting service definition. -service GreeterService { - // Sends a greeting - rpc SayHello (HelloRequest) returns (HelloReply) {} - - rpc ItKeepsTalking (stream HelloRequest) returns (HelloReply) {} - - rpc ItKeepsReplying (HelloRequest) returns (stream HelloReply) {} - - rpc StreamHellos (stream HelloRequest) returns (stream HelloReply) {} -} - -// The request message containing the user's name. -message HelloRequest { - string name = 1; -} - -// The response message containing the greetings -message HelloReply { - string message = 1; -} diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/test b/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/test deleted file mode 100644 index 7263ee7b0..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-cross-scala/test +++ /dev/null @@ -1,14 +0,0 @@ -> ++2.11.12 compile - -$ exists target/scala-2.11/src_managed -$ exists target/scala-2.11/src_managed/main/example/myapp/helloworld/grpc/HelloRequest.scala -$ exists target/scala-2.11/src_managed/main/example/myapp/helloworld/grpc/HelloworldProto.scala -$ exists target/scala-2.11/src_managed/main/example/myapp/helloworld/grpc/GreeterService.scala - -> clean -> ++2.12.8 compile - -$ exists target/scala-2.12/src_managed -$ exists target/scala-2.12/src_managed/main/example/myapp/helloworld/grpc/HelloRequest.scala -$ exists target/scala-2.12/src_managed/main/example/myapp/helloworld/grpc/HelloworldProto.scala -$ exists target/scala-2.12/src_managed/main/example/myapp/helloworld/grpc/GreeterService.scala