Merge of modules refactor into main (#530)

Author: nwbirnie

.gitignore

@@ -48,4 +48,5 @@ google-ads/*/buildNumber.properties
 # Gradle build output
 .gradle/
 buildSrc/.gradle/
-*/build
+*/build/
+

buildSrc/src/main/groovy/com.google.api-ads.gapic-stubs.gradle

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This is the build configuration for the google-ads-annotation-processing
+ * subproject.
+ */
+
+/** Defines a plugin that sets up a module to build generated stubs code. */
+plugins {
+    id 'com.google.api-ads.java-conventions'
+}
+
+dependencies {
+    implementation project(":google-ads-stubs-lib")
+    testFixturesImplementation 'org.slf4j:slf4j-api:1.7.25'
+    testFixturesImplementation 'com.google.api:gax-grpc::testlib'
+    testFixturesImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
+    testFixturesImplementation 'org.mockito:mockito-all:1.9.5'
+    testFixturesImplementation 'junit:junit:4.13.1'
+}
+
+// Required to expose gax-grpc::testlib.
+configurations.testImplementation.extendsFrom(configurations.testFixturesImplementation)
+// Required to expose GAX, gRPC etc.
+configurations.testFixturesImplementation.extendsFrom(configurations.implementation)
+
+publishing {
+    publications {
+        maven(MavenPublication) { publication ->
+            configurePom(publication,
+                    "Google Ads API client library for Java - " + project.name,
+                    "Stubs for GAAPI version " + project.name)
+        }
+    }
+}

buildSrc/src/main/groovy/com.google.api-ads.java-conventions.gradle

@@ -25,6 +25,7 @@ import java.util.regex.Matcher
 plugins {
   id 'java-library'
   id 'maven-publish'
+  id 'java-test-fixtures'
   id 'signing'
 }
 
@@ -76,6 +77,9 @@ publishing {
   }
 }
 
+components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
+components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
+
 // Provide a helpful error message for missing sonatype credentials.
 tasks.findAll {
   if (it.name.matches("publish.+ToSonatypeRepository")) {
@@ -154,9 +158,10 @@ dependencies {
   api 'io.grpc:grpc-stub'
   api 'io.grpc:grpc-protobuf'
   api 'com.google.auth:google-auth-library-oauth2-http'
-  implementation platform('com.google.cloud:google-cloud-shared-dependencies:2.4.0')
+  api platform('com.google.cloud:google-cloud-shared-dependencies:2.4.0')
   implementation 'com.google.guava:guava:30.0-android'
   implementation 'com.google.auto.service:auto-service:1.0-rc2'
+  implementation 'javax.annotation:javax.annotation-api'
   annotationProcessor 'com.google.auto.service:auto-service:1.0-rc2'
   testImplementation 'junit:junit:4.13.1'
 }