Make gradle work a bit

Refs akka#35
ennru · Jun 16, 2020 · ba32f2a · ba32f2a
1 parent 114ec45
commit ba32f2a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,19 +3,9 @@ language: scala
 scala:
   - 2.12.11
 
-#env:
-#  matrix:
-#    - TRAVIS_JDK=adopt@1.8.0-242
-#    - TRAVIS_JDK=adopt@1.11.0-6
-
 before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
 install: jabba install "$TRAVIS_JDK" && jabba use "$_" && java -Xmx32m -version
 
-#script:
-# - sbt test docs/paradox
-# - sbt new file://$PWD --name=hello-world-grpc --force && pushd hello-world-grpc &&  mvn test         && popd || travis_terminate 1
-# - sbt new file://$PWD --name=hello-world-grpc --force && pushd hello-world-grpc &&  ./gradlew build  && popd || travis_terminate 1
-
 jobs:
   include:
     - stage: check

diff --git a/src/main/g8/build.gradle b/src/main/g8/build.gradle
@@ -2,15 +2,18 @@ buildscript {
   repositories {
     mavenLocal()
     gradlePluginPortal()
+    // TODO remove when Akka gRPC 1.0.0 is final
+    maven {
+      url "https://dl.bintray.com/akka/snapshots/"
+    }
   }
 
   dependencies {
     // see https://plugins.gradle.org/plugin/com.lightbend.akka.grpc.gradle
     // for the currently latest version.
-    //classpath 'gradle.plugin.com.lightbend.akka.grpc:akka-grpc-gradle-plugin:0.1'
-
-    // FIXME For testing we use another group id:
-    classpath 'com.lightbend.akka.grpc:akka-grpc-gradle-plugin:$akka_grpc_version$'
+    //classpath 'com.lightbend.akka.grpc:akka-grpc-gradle-plugin:$akka_grpc_version$'
+    // TODO remove when Akka gRPC 1.0.0 is final
+    classpath 'com.lightbend.akka.grpc:akka-grpc-gradle-plugin:1.0.0-M1+37-732f2dee'
 
     classpath "gradle.plugin.com.github.maiflai:gradle-scalatest:0.22"
   }
@@ -29,6 +32,10 @@ apply plugin: "com.github.maiflai.scalatest"
 repositories {
   mavenLocal()
   mavenCentral()
+  // TODO remove when Akka gRPC 1.0.0 is final
+  maven {
+    url "https://dl.bintray.com/akka/snapshots/"
+  }
 }
 
 // Define a separate configuration for managing the dependency on Jetty ALPN agent.

diff --git a/src/main/g8/gradle/wrapper/gradle-wrapper.properties b/src/main/g8/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip