Remove custom DSL to disable kotlin checks.

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java

@@ -16,6 +16,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabExtension;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -39,7 +40,7 @@ public class FirebaseLibraryExtension {
   public boolean publishSources;
 
   /** Static analysis configuration. */
-  public final FirebaseStaticAnalysis staticAnalysis = new FirebaseStaticAnalysis();
+  public final FirebaseStaticAnalysis staticAnalysis;
 
   /** Firebase Test Lab configuration/ */
   public final FirebaseTestLabExtension testLab;
@@ -78,6 +79,20 @@ public FirebaseLibraryExtension(Project project) {
       artifactId.set(new DefaultProvider<>(project::getName));
       groupId.set(new DefaultProvider<>(() -> project.getGroup().toString()));
     }
+    this.staticAnalysis = initializeStaticAnalysis(project);
+  }
+
+  private FirebaseStaticAnalysis initializeStaticAnalysis(Project project) {
+    return new FirebaseStaticAnalysis(
+        projectsFromProperty(project, "firebase.checks.errorproneProjects"),
+        projectsFromProperty(project, "firebase.checks.lintProjects"));
+  }
+
+  private Set<String> projectsFromProperty(Project project, String propertyName) {
+    if (!project.hasProperty(propertyName)) {
+      return Collections.emptySet();
+    }
+    return ImmutableSet.copyOf(project.property(propertyName).toString().split(",", -1));
   }
 
   /** Configure Firebase Test Lab. */

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java

@@ -17,23 +17,13 @@
 import com.android.build.gradle.LibraryExtension;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 
-import java.util.Set;
-
 public class FirebaseLibraryPlugin implements Plugin<Project> {
 
-  private static final Set<String> KOTLIN_CHECKS =
-      ImmutableSet.of(
-          "FirebaseNoHardKeywords",
-          "FirebaseLambdaLast",
-          "FirebaseUnknownNullness",
-          "FirebaseKotlinPropertyAccess");
-
   @Override
   public void apply(Project project) {
     project.apply(ImmutableMap.of("plugin", "com.android.library"));
@@ -106,11 +96,6 @@ private static void setupStaticAnalysis(
                       }
                     }));
 
-    library.staticAnalysis.subscribeToKotlinInteropLintDisabled(
-        () ->
-            android.lintOptions(
-                lintOptions -> lintOptions.disable(KOTLIN_CHECKS.toArray(new String[0]))));
-
     project.getTasks().register("firebaseLint", task -> task.dependsOn("lint"));
   }
 

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java

@@ -14,45 +14,15 @@
 
 package com.google.firebase.gradle.plugins;
 
-import com.google.common.collect.ImmutableSet;
-
-import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Consumer;
 
 public class FirebaseStaticAnalysis {
   public Set<String> errorproneCheckProjects;
   public Set<String> androidLintCheckProjects;
 
-
-  private boolean disableKotlinInteropLint;
-
-  private final Set<Runnable> kotlinInteropLintDisabledSubscribers = new HashSet<>();
-
-  public FirebaseStaticAnalysis() {
-    this(ImmutableSet.of(":tools:errorprone"), ImmutableSet.of(":tools:lint"));
-  }
-
-  public FirebaseStaticAnalysis(Set<String> errorproneCheckProjects, Set<String> androidLintCheckProjects) {
+  public FirebaseStaticAnalysis(
+      Set<String> errorproneCheckProjects, Set<String> androidLintCheckProjects) {
     this.errorproneCheckProjects = errorproneCheckProjects;
     this.androidLintCheckProjects = androidLintCheckProjects;
   }
-
-  /** Indicates whether Kotlin Interop Lint checks are enabled for public APIs of the library. */
-  public void disableKotlinInteropLint() {
-    if (disableKotlinInteropLint) {
-      return;
-    }
-    disableKotlinInteropLint = true;
-    for (Runnable subscription : kotlinInteropLintDisabledSubscribers) {
-      subscription.run();
-    }
-  }
-
-  void subscribeToKotlinInteropLintDisabled(Runnable subscription) {
-    this.kotlinInteropLintDisabledSubscribers.add(subscription);
-    if (disableKotlinInteropLint) {
-      subscription.run();
-    }
-  }
 }

buildSrc/src/test/groovy/com/google/firebase/gradle/plugins/publish/PublishingPluginSpec.groovy

@@ -29,12 +29,6 @@ class PublishingPluginSpec extends Specification {
         plugins {
             id 'firebase-library'
         }
-        firebaseLibrary {
-          staticAnalysis {
-            errorproneCheckProjects = []
-            androidLintCheckProjects = []
-          }
-        }
         group = '${group}'
         version = '${version}'
         <% if (latestReleasedVersion) println "ext.latestReleasedVersion = $latestReleasedVersion" %>

firebase-datatransport/firebase-datatransport.gradle

@@ -19,7 +19,6 @@ plugins {
 firebaseLibrary {
     publishJavadoc = false
     publishSources = true
-    staticAnalysis.disableKotlinInteropLint()
 }
 
 android {

firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

@@ -19,7 +19,6 @@ plugins {
 firebaseLibrary {
     testLab.enabled = true
     publishSources = true
-    staticAnalysis.disableKotlinInteropLint()
 }
 
 android {
@@ -34,9 +33,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    // TODO: b/111563140
     lintOptions {
-        abortOnError false
+        // TODO: b/111563140
+        disable "InvalidPackage"
+
+        disable "FirebaseUnknownNullness"
     }
 
     compileOptions {

gradle.properties

@@ -20,3 +20,6 @@ android.useAndroidX=true
 
 org.gradle.parallel=true
 org.gradle.caching=true
+
+firebase.checks.errorproneProjects=:tools:errorprone
+firebase.checks.lintProjects=:tools:lint

protolite-well-known-types/protolite-well-known-types.gradle

@@ -17,10 +17,6 @@ plugins {
     id 'com.google.protobuf'
 }
 
-firebaseLibrary {
-    staticAnalysis.disableKotlinInteropLint()
-}
-
 
 protobuf {
     protoc {

transport/transport-api/src/main/java/com/google/android/datatransport/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport;

transport/transport-api/transport-api.gradle

@@ -18,7 +18,6 @@ plugins {
 
 firebaseLibrary{
     publishJavadoc = false
-    staticAnalysis.disableKotlinInteropLint()
 }
 
 android {

transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.cct;

transport/transport-backend-cct/transport-backend-cct.gradle

@@ -19,7 +19,6 @@ plugins {
 
 firebaseLibrary{
     publishJavadoc = false
-    staticAnalysis.disableKotlinInteropLint()
 }
 
 protobuf {

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/backends/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime.backends;

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime;

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime.scheduling.jobscheduling;

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime.scheduling;

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime.scheduling.persistence;

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/synchronization/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime.synchronization;

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/time/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2019 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
+//
+//      http://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.
+
+/** @hide */
+package com.google.android.datatransport.runtime.time;

transport/transport-runtime/transport-runtime.gradle

@@ -32,7 +32,6 @@ firebaseLibrary {
         device 'model=hero2lte,version=23' // Galaxy S7
         device 'model=htc_m8,version=19' // HTC One (M8)
     }
-    staticAnalysis.disableKotlinInteropLint()
 }
 
 android {