Merge pull request #5 from UweTrottmann/fix-gradle-6

Fix Gradle 6

Author: UweTrottmann

.github/workflows/gradle.yml

@@ -27,4 +27,5 @@ jobs:
         uses: gradle/gradle-build-action@243af859f8ca30903d9d7f7936897ca0358ba691 # v2.7.1
 
       - name: Execute Gradle build
-        run: ./gradlew build -x :endpoints-management-control-appengine-all:build -x :endpoints-management-control-all:build
+        # run: ./gradlew build -x :endpoints-management-control-appengine-all:build -x :endpoints-management-control-all:build
+        run: ./gradlew build

build.gradle

@@ -17,12 +17,18 @@
 allprojects {
   apply plugin: 'eclipse'
   apply plugin: 'jacoco'
-  apply plugin: 'java'
+  apply plugin: 'java-library'
   apply plugin: 'maven'
   apply plugin: 'signing'
 
   group = 'com.google.endpoints'
 
+  java {
+    toolchain {
+      languageVersion = JavaLanguageVersion.of(8)
+    }
+  }
+
   jacocoTestReport {
     reports {
       xml.enabled true
@@ -59,18 +65,6 @@ subprojects {
     mavenCentral()
   }
 
-  compileJava {
-    // Workaround to actually apply project compatibility
-    sourceCompatibility = project.sourceCompatibility
-    targetCompatibility = project.targetCompatibility
-  }
-
-  compileTestJava {
-    // Workaround to actually apply project compatibility
-    sourceCompatibility = project.sourceCompatibility
-    targetCompatibility = project.targetCompatibility
-  }
-
   ext {
     libraries = [
       grpcBom: "io.grpc:grpc-bom:${grpcVersion}",

endpoints-auth/build.gradle

@@ -22,24 +22,24 @@ configureMaven(
 archivesBaseName = 'endpoints-management-auth'
 
 configurations {
-  integrationTestCompile.extendsFrom testCompile
-  integrationTestRuntime.extendsFrom testRuntime
+  integrationTestCompile.extendsFrom testImplementation
+  integrationTestRuntime.extendsFrom testRuntimeOnly
 }
 
 dependencies {
   implementation project(":endpoints-service-config")
-  implementation(project(":endpoints-control")) {
-    transitive = false
+  api(project(":endpoints-control")) {
+    transitive = false // Just importing a model file (MethodRegistry.AuthInfo), do not pull in all dependencies.
   }
 
   implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
   implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-  implementation "com.google.guava:guava:${guavaVersion}"
+  api "com.google.guava:guava:${guavaVersion}"
   implementation "com.google.flogger:flogger:${floggerVersion}"
   runtimeOnly "com.google.flogger:flogger-system-backend:${floggerVersion}"
-  implementation "com.google.http-client:google-http-client:${httpClientVersion}"
-  implementation "javax.servlet:servlet-api:${servletApiVersion}"
-  implementation "org.bitbucket.b_c:jose4j:${jose4jVersion}"
+  api "com.google.http-client:google-http-client:${httpClientVersion}"
+  api "javax.servlet:servlet-api:${servletApiVersion}"
+  api "org.bitbucket.b_c:jose4j:${jose4jVersion}"
 
   testImplementation "junit:junit:${junitVersion}"
   testImplementation "org.bouncycastle:bcmail-jdk15on:${bouncycastleVersion}"

endpoints-control-api-client/build.gradle

@@ -32,10 +32,9 @@ dependencies {
   implementation("com.google.api-client:google-api-client-protobuf:${googleApiClientProtobufVersion}") {
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  implementation module(group: 'com.google.api-client', name: 'google-api-client', version: '1.22.0') {
-    dependency('com.google.http-client:google-http-client:1.22.0')
-    dependency('com.google.oauth-client:google-oauth-client:1.22.0')
+  implementation("com.google.api-client:google-api-client:${googleApiClientProtobufVersion}") {
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  implementation project(":endpoints-management-protos")
+  api("com.google.http-client:google-http-client:$httpClientVersion")
+  api project(":endpoints-management-protos")
 }

endpoints-control-appengine/build.gradle

@@ -22,17 +22,16 @@ configureMaven(
 archivesBaseName = 'endpoints-management-control-appengine'
 
 dependencies {
+  api project(":endpoints-control")
   implementation "com.google.appengine:appengine-api-1.0-sdk:$appengineSdkVersion"
-  implementation "com.google.code.findbugs:jsr305:${jsr305Version}"
-  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
   implementation "com.google.guava:guava:${guavaVersion}"
-  implementation("com.google.http-client:google-http-client-jackson2:${httpClientVersion}") {
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  implementation("com.google.http-client:google-http-client:${httpClientVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
   implementation(group: 'com.google.api-client', name: 'google-api-client-appengine', version: "${googleApiClientAppEngineVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  implementation project(":endpoints-control")
 }

endpoints-control/build.gradle

@@ -50,26 +50,26 @@ processResources {
 dependencies {
   implementation "com.google.auto.value:auto-value-annotations:${autoValueVersion}"
   annotationProcessor "com.google.auto.value:auto-value:${autoValueVersion}"
-  implementation "com.google.code.findbugs:jsr305:${jsr305Version}"
-  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  api "com.google.code.findbugs:jsr305:${jsr305Version}"
   implementation "com.google.flogger:flogger:${floggerVersion}"
   runtimeOnly "com.google.flogger:flogger-system-backend:${floggerVersion}"
-  implementation "com.google.guava:guava:${guavaVersion}"
+  api "com.google.guava:guava:${guavaVersion}"
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
   implementation("com.google.http-client:google-http-client-jackson2:${httpClientVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  implementation "javax.servlet:servlet-api:${servletApiVersion}"
-  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-  implementation(group: 'com.google.api-client', name: 'google-api-client-appengine', version: "${googleApiClientAppEngineVersion}") {
+  implementation("com.google.api-client:google-api-client:${googleApiClientProtobufVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  implementation project(":endpoints-control-api-client")
+  api "javax.servlet:servlet-api:${servletApiVersion}"
+  api project(":endpoints-control-api-client")
   implementation project(":endpoints-service-config")
-  implementation project(":endpoints-management-protos")
+  api project(":endpoints-management-protos")
 
   testImplementation "junit:junit:${junitVersion}"
   testImplementation "com.google.truth:truth:${truthVersion}"
   testImplementation "org.mockito:mockito-core:${mockitoVersion}"
+  testImplementation "com.google.protobuf:protobuf-java-util"
 }

endpoints-control/src/main/java/com/google/api/control/Client.java

@@ -684,18 +684,18 @@ public String toString() {
   /**
    * SchedulerFactory defines a method for creating {@link Scheduler} instances
    */
-  interface SchedulerFactory {
+  public interface SchedulerFactory {
     /**
      * @param ticker obtains time updates from a time source.
-     * @return a {@ link Scheduler}
+     * @return a {@link Scheduler}
      */
     Scheduler create(Ticker ticker);
   }
 
   /**
    * Scheduler uses a {@code PriorityQueue} to maintain a series of {@link Runnable}
    */
-  static class Scheduler {
+  public static class Scheduler {
     private PriorityQueue<ScheduledEvent> queue;
     private Ticker ticker;
     private Statistics statistics;

endpoints-framework-auth/build.gradle

@@ -22,8 +22,10 @@ configureMaven(
 archivesBaseName = "endpoints-framework-auth"
 
 dependencies {
-  compileOnly group: "com.google.endpoints", name: "endpoints-framework", version: "${endpointsFrameworkVersion}"
+  api group: "com.google.endpoints", name: "endpoints-framework", version: "${endpointsFrameworkVersion}"
+  api "javax.servlet:servlet-api:${servletApiVersion}"
   implementation project(":endpoints-auth")
+  implementation project(":endpoints-control")
 
   testImplementation group: "junit", name: "junit", version: "${junitVersion}"
   testImplementation group: "org.mockito", name: "mockito-core", version: "${mockitoVersion}"

endpoints-management-protos/build.gradle

@@ -5,28 +5,26 @@ buildscript {
   dependencies { classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10' }
 }
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'maven'
 apply plugin: 'signing'
 apply plugin: 'com.google.protobuf'
 
 description = 'GRPC library for the servicecontrol-v1 service'
 // TODO: use a flag to determine whether to produce a release or a snapshot
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
 
 repositories {
   mavenCentral()
   mavenLocal()
 }
 
 dependencies {
-  implementation platform(libraries.protobufJavaBom),
-          libraries.protobufJava
+  api platform(libraries.protobufJavaBom)
+  api libraries.protobufJava
 
-  implementation platform(libraries.grpcBom),
-          libraries.grpcStub,
-          libraries.grpcProtobuf
+  api platform(libraries.grpcBom)
+  api libraries.grpcStub
+  api libraries.grpcProtobuf
 }
 
 protobuf {

endpoints-service-config/build.gradle

@@ -22,12 +22,10 @@ configureMaven(
 archivesBaseName = 'endpoints-management-config'
 
 dependencies {
-  implementation(project(":endpoints-management-protos"))
-  implementation platform(libraries.protobufJavaBom)
-  implementation "com.google.protobuf:protobuf-java"
+  api(project(":endpoints-management-protos"))
   implementation "com.google.apis:google-api-services-servicemanagement:$servicemanagementVersion"
   compileOnly "com.google.appengine:appengine-api-1.0-sdk:$appengineSdkVersion"
-  implementation "com.google.guava:guava:$guavaVersion"
+  api "com.google.guava:guava:$guavaVersion"
   implementation "com.google.http-client:google-http-client:$httpClientVersion"
   implementation "com.google.protobuf:protobuf-java-util"