Bump to Gradle 7.3.3

Android Gradle plugin bumped to 4.2.0 in examples, for Gradle 7 compat and to match main build. Jib 3 changed default base image away from distroless, but we do want to use distroless.
grpc · Jan 10, 2022 · e0dca93 · e0dca93
1 parent d7f951a
commit e0dca93
Show file tree

Hide file tree

Showing 16 changed files with 409 additions and 274 deletions.
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
@@ -6,12 +6,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 27
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "io.grpc.clientcacheexample"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 29
         multiDexEnabled true
         versionCode 1
         versionName "1.0"

diff --git a/examples/android/clientcache/build.gradle b/examples/android/clientcache/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.18"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
@@ -6,12 +6,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 27
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "io.grpc.helloworldexample"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.18"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
@@ -6,12 +6,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 27
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "io.grpc.routeguideexample"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.18"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle
@@ -6,13 +6,13 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "io.grpc.strictmodehelloworldexample"
         // API level 28 is required for StrictMode penaltyListener
         minSdkVersion 28
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/android/strictmode/build.gradle b/examples/android/strictmode/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.18"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'java'
 
     id "com.google.protobuf" version "0.8.17"
-    id 'com.google.cloud.tools.jib' version '2.7.0' // For releasing to Docker Hub
+    id 'com.google.cloud.tools.jib' version '3.1.4' // For releasing to Docker Hub
 }
 
 repositories {
@@ -56,6 +56,7 @@ mainClassName = 'io.grpc.examples.hostname.HostnameServer'
 
 // For releasing to Docker Hub
 jib {
+  from.image = "gcr.io/distroless/java:8"
   container.ports = ['50051']
   outputPaths {
     tar = 'build/example-hostname.tar'

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists