Merge branch 'grpc:master' into master

Author: wwtbuaa01

RELEASING.md

@@ -210,6 +210,9 @@ Finally, document and publicize the release.
 2. Post a release announcement to [grpc-io](https://groups.google.com/forum/#!forum/grpc-io)
    (`[email protected]`). The title should be something that clearly identifies
    the release (e.g.`GRPC-Java <tag> Released`).
+   - Note that there may have been backports to the release branch since you
+     generated the release notes. Please verify that any backports are reflected
+     in the release notes before sending them out.
 
 Update Hosted Javadoc
 ---------------------

alts/build.gradle

@@ -9,8 +9,6 @@ plugins {
 
 description = "gRPC: ALTS"
 
-evaluationDependsOn(project(':grpc-core').path)
-
 dependencies {
     api project(':grpc-core')
     implementation project(':grpc-auth'),
@@ -28,7 +26,7 @@ dependencies {
     shadow project(path: ':grpc-netty-shaded', configuration: 'shadow')
 
     testImplementation project(':grpc-testing'),
-            project(':grpc-core').sourceSets.test.output,
+            testFixtures(project(':grpc-core')),
             project(':grpc-testing-proto'),
             libraries.guava,
             libraries.junit,

android-interop-testing/build.gradle

@@ -30,12 +30,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/build.gradle

@@ -12,11 +12,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         consumerProguardFiles "proguard-rules.txt"
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

api/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "java-library"
+    id "java-test-fixtures"
     id "maven-publish"
 
     id "me.champeau.jmh"
@@ -8,15 +9,16 @@ plugins {
 
 description = 'gRPC: API'
 
-evaluationDependsOn(project(':grpc-context').path)
-
 dependencies {
     api project(':grpc-context'),
             libraries.jsr305,
             libraries.errorprone.annotations
     implementation libraries.guava
 
-    testImplementation project(':grpc-context').sourceSets.test.output,
+    testFixturesImplementation libraries.guava,
+            libraries.junit,
+            libraries.mockito.core
+    testImplementation testFixtures(project(':grpc-context')),
             project(':grpc-testing'),
             project(':grpc-grpclb')
     testImplementation (libraries.guava.testlib) {
@@ -32,3 +34,6 @@ tasks.named("javadoc").configure {
     // We want io.grpc.Internal, but not io.grpc.Internal*
     exclude 'io/grpc/Internal?*.java'
 }
+
+components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
+components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }

api/src/test/java/io/grpc/ForwardingTestUtil.java renamed to api/src/testFixtures/java/io/grpc/ForwardingTestUtil.java

@@ -19,7 +19,7 @@ dependencies {
 
     testImplementation project(':grpc-testing'),
             project(':grpc-testing-proto'),
-            project(':grpc-core').sourceSets.test.output  // for FakeClock
+            testFixtures(project(':grpc-core'))
     testImplementation (libraries.guava.testlib) {
         exclude group: 'junit', module: 'junit'
     }