grpc · sanjaypujare · Jun 29, 2023 · Jun 21, 2023 · Jun 26, 2023 · Jun 27, 2023
diff --git a/api/BUILD.bazel b/api/BUILD.bazel
@@ -2,6 +2,7 @@ java_library(
     name = "api",
     srcs = glob([
         "src/main/java/**/*.java",
+        "src/context/java/**/*.java",
     ]),
     javacopts = ["-Xep:DoNotCall:OFF"],  # Remove once requiring Bazel 3.4.0+; allows non-final
     visibility = ["//visibility:public"],
@@ -13,4 +14,5 @@ java_library(
         "@com_google_guava_guava//jar",
         "@com_google_j2objc_j2objc_annotations//jar",
     ],
+    exports = ["//context"],
 )
diff --git a/api/build.gradle b/api/build.gradle
@@ -9,17 +9,31 @@ plugins {
 
 description = 'gRPC: API'
 
+sourceSets {
+    context
+    main {
+        output.classesDirs.from(sourceSets.context.output.classesDirs)
+    }
+}
+
+compileContextJava {
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+}
+
+
 dependencies {
-    api project(':grpc-context'),
-            libraries.jsr305,
+    compileOnly sourceSets.context.output
+    api libraries.jsr305,
             libraries.errorprone.annotations
     implementation libraries.guava
 
+    testFixturesApi libraries.truth
+    testFixturesImplementation libraries.jsr305
     testFixturesImplementation libraries.guava,
             libraries.junit,
             libraries.mockito.core
-    testImplementation testFixtures(project(':grpc-context')),
-            project(':grpc-testing'),
+    testImplementation project(':grpc-testing'),
             project(':grpc-grpclb')
     testImplementation libraries.guava.testlib
     jmh project(':grpc-core')
@@ -29,9 +43,14 @@ dependencies {
 }
 
 tasks.named("javadoc").configure {
+    source sourceSets.context.allSource
     // We want io.grpc.Internal, but not io.grpc.Internal*
     exclude 'io/grpc/Internal?*.java'
 }
 
+tasks.named("sourcesJar").configure {
+    from sourceSets.context.allSource
+}
+
 components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
 components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
diff --git a/context/src/main/java/io/grpc/Context.java → api/src/context/java/io/grpc/Context.java b/context/src/main/java/io/grpc/Context.java → api/src/context/java/io/grpc/Context.java
diff --git a/context/src/main/java/io/grpc/Deadline.java → api/src/context/java/io/grpc/Deadline.java b/context/src/main/java/io/grpc/Deadline.java → api/src/context/java/io/grpc/Deadline.java
diff --git a/...o/grpc/PersistentHashArrayMappedTrie.java → ...o/grpc/PersistentHashArrayMappedTrie.java b/...o/grpc/PersistentHashArrayMappedTrie.java → ...o/grpc/PersistentHashArrayMappedTrie.java
diff --git a/...va/io/grpc/ThreadLocalContextStorage.java → ...va/io/grpc/ThreadLocalContextStorage.java b/...va/io/grpc/ThreadLocalContextStorage.java → ...va/io/grpc/ThreadLocalContextStorage.java
diff --git a/...h/java/io/grpc/AttachDetachBenchmark.java → ...h/java/io/grpc/AttachDetachBenchmark.java b/...h/java/io/grpc/AttachDetachBenchmark.java → ...h/java/io/grpc/AttachDetachBenchmark.java
diff --git a/...t/src/jmh/java/io/grpc/ReadBenchmark.java → api/src/jmh/java/io/grpc/ReadBenchmark.java b/...t/src/jmh/java/io/grpc/ReadBenchmark.java → api/src/jmh/java/io/grpc/ReadBenchmark.java
diff --git a/.../src/jmh/java/io/grpc/WriteBenchmark.java → api/src/jmh/java/io/grpc/WriteBenchmark.java b/.../src/jmh/java/io/grpc/WriteBenchmark.java → api/src/jmh/java/io/grpc/WriteBenchmark.java
diff --git a/...xt/src/test/java/io/grpc/ContextTest.java → api/src/test/java/io/grpc/ContextTest.java b/...xt/src/test/java/io/grpc/ContextTest.java → api/src/test/java/io/grpc/ContextTest.java
diff --git a/...t/src/test/java/io/grpc/DeadlineTest.java → api/src/test/java/io/grpc/DeadlineTest.java b/...t/src/test/java/io/grpc/DeadlineTest.java → api/src/test/java/io/grpc/DeadlineTest.java
diff --git a/...pc/PersistentHashArrayMappedTrieTest.java → ...pc/PersistentHashArrayMappedTrieTest.java b/...pc/PersistentHashArrayMappedTrieTest.java → ...pc/PersistentHashArrayMappedTrieTest.java
diff --git a/...o/grpc/ThreadLocalContextStorageTest.java → ...o/grpc/ThreadLocalContextStorageTest.java b/...o/grpc/ThreadLocalContextStorageTest.java → ...o/grpc/ThreadLocalContextStorageTest.java
diff --git a/...ava/io/grpc/StaticTestingClassLoader.java → ...ava/io/grpc/StaticTestingClassLoader.java b/...ava/io/grpc/StaticTestingClassLoader.java → ...ava/io/grpc/StaticTestingClassLoader.java
diff --git a/...java/io/grpc/testing/DeadlineSubject.java → ...java/io/grpc/testing/DeadlineSubject.java b/...java/io/grpc/testing/DeadlineSubject.java → ...java/io/grpc/testing/DeadlineSubject.java
diff --git a/census/build.gradle b/census/build.gradle
@@ -9,12 +9,13 @@ description = 'gRPC: Census'
 
 dependencies {
     api project(':grpc-api')
+    // force dependent jars to depend on latest grpc-context
+    runtimeOnly project(":grpc-context")
     implementation libraries.guava,
             libraries.opencensus.api,
             libraries.opencensus.contrib.grpc.metrics
 
     testImplementation testFixtures(project(':grpc-api')),
-            testFixtures(project(':grpc-context')),
             testFixtures(project(':grpc-core')),
             project(':grpc-testing'),
             libraries.opencensus.impl

diff --git a/context/BUILD.bazel b/context/BUILD.bazel
@@ -1,7 +1,4 @@
 java_library(
     name = "context",
-    srcs = glob([
-        "src/main/java/**/*.java",
-    ]),
     visibility = ["//visibility:public"],
 )
diff --git a/context/build.gradle b/context/build.gradle
@@ -1,31 +1,14 @@
 plugins {
-    id "java"
-    id "java-test-fixtures"
+    id "java-library"
     id "maven-publish"
-
-    id "me.champeau.gradle.japicmp"
-    id "me.champeau.jmh"
-    id "ru.vyarus.animalsniffer"
 }
 
 description = 'gRPC: Context'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
 dependencies {
-    testFixturesApi libraries.truth
-    // Explicitly choose the guava version to stay Java 7-compatible.
-    testFixturesImplementation 'com.google.guava:guava:30.1.1-android'
-    testFixturesImplementation libraries.jsr305
-    testImplementation libraries.jsr305
-    // Explicitly choose the guava version to stay Java 7-compatible. The rest of gRPC can move
-    // forward to Java 8-requiring versions. This is also only used for testing, so is unlikely to
-    // cause problems.
-    testImplementation 'com.google.guava:guava-testlib:30.1.1-android'
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    runtimeOnly (project(":grpc-api")) {
+        exclude group: "com.google.guava", module: "guava"
+        exclude group: "com.google.code.findbugs", module: "jsr305"
+        exclude group: "com.google.errorprone", module: "error_prone_annotations"
+    }
 }
-
-components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
-components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
diff --git a/core/build.gradle b/core/build.gradle
@@ -22,6 +22,8 @@ description = 'gRPC: Core'
 
 dependencies {
     api project(':grpc-api')
+    // force dependent jars to depend on latest grpc-context
+    runtimeOnly project(":grpc-context")
     implementation libraries.gson,
             libraries.android.annotations,
             libraries.animalsniffer.annotations,
@@ -33,8 +35,7 @@ dependencies {
             libraries.mockito.core,
             libraries.truth,
             project(':grpc-testing')
-    testImplementation testFixtures(project(':grpc-context')),
-            testFixtures(project(':grpc-api')),
+    testImplementation testFixtures(project(':grpc-api')),
             project(':grpc-testing'),
             project(':grpc-grpclb')
     testImplementation libraries.guava.testlib

diff --git a/gcp-observability/build.gradle b/gcp-observability/build.gradle
@@ -63,7 +63,7 @@ dependencies {
             libraries.checker.qual, // Explicit dependency to keep in step with version used by guava
             libraries.j2objc.annotations // Explicit dependency to keep in step with version used by guava
 
-    testImplementation testFixtures(project(':grpc-context')),
+    testImplementation testFixtures(project(':grpc-api')),
             project(':grpc-testing'),
             project(':grpc-testing-proto')
     testImplementation (libraries.guava.testlib) {

diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle
@@ -45,8 +45,7 @@ dependencies {
             libraries.netty.tcnative.classes,
             project(':grpc-grpclb'),
             project(':grpc-rls')
-    testImplementation testFixtures(project(':grpc-context')),
-            testFixtures(project(':grpc-api')),
+    testImplementation testFixtures(project(':grpc-api')),
             testFixtures(project(':grpc-core')),
             libraries.mockito.core,
             libraries.okhttp

diff --git a/istio-interop-testing/build.gradle b/istio-interop-testing/build.gradle
@@ -26,8 +26,7 @@ dependencies {
 
     runtimeOnly libraries.netty.tcnative,
             libraries.netty.tcnative.classes
-    testImplementation testFixtures(project(':grpc-context')),
-            testFixtures(project(':grpc-api')),
+    testImplementation testFixtures(project(':grpc-api')),
             testFixtures(project(':grpc-core')),
             libraries.mockito.core,
             libraries.junit,

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -14,7 +14,7 @@ dependencies {
             libraries.junit
     // Only io.grpc.internal.testing.StatsTestUtils depends on opencensus_api, for internal use.
     compileOnly libraries.opencensus.api
-    runtimeOnly project(":grpc-context") // Pull in newer version than census-api
+    runtimeOnly project(":grpc-api")   // Pull in newer version than census-api
 
     testImplementation libraries.mockito.core