diff --git a/endpoints/getting-started-grpc/api/build.gradle b/endpoints/getting-started-grpc/api/build.gradle
index d11e5483325..6e04eab968f 100644
--- a/endpoints/getting-started-grpc/api/build.gradle
+++ b/endpoints/getting-started-grpc/api/build.gradle
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'com.google.protobuf'
 
 buildscript {
@@ -33,9 +33,9 @@ dependencies {
   repositories {
     mavenCentral()
   }
-  compile "io.grpc:grpc-netty:${grpcVersion}"
-  compile "io.grpc:grpc-protobuf:${grpcVersion}"
-  compile "io.grpc:grpc-stub:${grpcVersion}"
+  api "io.grpc:grpc-netty:${grpcVersion}"
+  api "io.grpc:grpc-protobuf:${grpcVersion}"
+  api "io.grpc:grpc-stub:${grpcVersion}"
 }
 
 protobuf {
diff --git a/endpoints/getting-started-grpc/client/build.gradle b/endpoints/getting-started-grpc/client/build.gradle
index a1f2fb9bd1a..3301980e7bd 100644
--- a/endpoints/getting-started-grpc/client/build.gradle
+++ b/endpoints/getting-started-grpc/client/build.gradle
@@ -16,18 +16,20 @@
 
 apply plugin: 'application'
 
-mainClassName = "com.google.endpoints.examples.hello.HelloWorldClient"
+application {
+  mainClass = "com.google.endpoints.examples.hello.HelloWorldClient"
+}
 
 jar {
   manifest {
-    attributes "Main-Class": "$mainClassName"
+    attributes "Main-Class": application.mainClass.get()
   }
   from {
-    configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
   }
 }
 
 dependencies {
-  compile project(':api')
-  compile 'commons-cli:commons-cli:1.6.0'
+  implementation project(':api')
+  implementation 'commons-cli:commons-cli:1.6.0'
 }
diff --git a/endpoints/getting-started-grpc/server/build.gradle b/endpoints/getting-started-grpc/server/build.gradle
index c5816792c8d..1c9bdb7b027 100644
--- a/endpoints/getting-started-grpc/server/build.gradle
+++ b/endpoints/getting-started-grpc/server/build.gradle
@@ -16,17 +16,19 @@
 
 apply plugin: 'application'
 
-mainClassName = "com.google.endpoints.examples.hello.HelloWorldServer"
+application {
+  mainClass = "com.google.endpoints.examples.hello.HelloWorldServer"
+}
 
 jar {
   manifest {
-    attributes "Main-Class": "$mainClassName"
+    attributes "Main-Class": application.mainClass.get()
   }
   from {
-    configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
   }
 }
 
 dependencies {
-  compile project(':api')
+  implementation project(':api')
 }