diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle index 03d603bd3c..78cadc6058 100644 --- a/gae-interop-testing/gae-jdk8/build.gradle +++ b/gae-interop-testing/gae-jdk8/build.gradle @@ -19,7 +19,6 @@ buildscript { url "https://maven-central.storage-download.googleapis.com/maven2/" } } dependencies { - classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.3.0' classpath 'com.squareup.okhttp:okhttp:2.7.4' } } @@ -29,6 +28,7 @@ plugins { id "war" id "ru.vyarus.animalsniffer" + id 'com.google.cloud.tools.appengine' version '2.3.0' } description = 'gRPC: gae interop testing (jdk8)' diff --git a/settings.gradle b/settings.gradle index 2bce28fc22..2d2c65c897 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,20 +3,24 @@ pluginManagement { id "com.android.application" version "7.4.0" id "com.android.library" version "7.4.0" id "com.github.johnrengelman.shadow" version "7.1.2" - id "com.github.kt3k.coveralls" version "2.12.0" + id "com.github.kt3k.coveralls" version "2.12.2" + id "com.google.cloud.tools.appengine" version "2.4.4" id "com.google.cloud.tools.jib" version "3.3.1" - id "com.google.osdetector" version "1.7.1" - id "com.google.protobuf" version "0.9.1" - id "me.champeau.gradle.japicmp" version "0.3.0" - id "me.champeau.jmh" version "0.6.8" - id "net.ltgt.errorprone" version "3.0.1" - id "ru.vyarus.animalsniffer" version "1.6.0" + id "com.google.osdetector" version "1.7.3" + id "com.google.protobuf" version "0.9.3" + id "me.champeau.gradle.japicmp" version "0.4.1" + id "me.champeau.jmh" version "0.7.1" + id "net.ltgt.errorprone" version "3.1.0" + id "ru.vyarus.animalsniffer" version "1.7.0" } resolutionStrategy { eachPlugin { if (target.id.namespace == "com.android") { useModule("com.android.tools.build:gradle:${target.version}") } + if (requested.id.id.startsWith('com.google.cloud.tools.appengine')) { + useModule("com.google.cloud.tools:appengine-gradle-plugin:${requested.version}") + } } } repositories {