Merge

Author: schmidt-sebastian

.idea/runConfigurations/Firestore_Integration_Tests__Firestore_Emulator_.xml

@@ -0,0 +1,68 @@
+// 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
+//
+//      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.
+
+import com.google.firebase.gradle.MultiProjectReleasePlugin
+
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext.kotlinVersion = '1.3.72'
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        maven {
+            url 'https://storage.googleapis.com/android-ci/mvn/'
+        }
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.3'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
+        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.2.1'
+        classpath 'org.jsoup:jsoup:1.11.2'
+        classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8'
+        classpath 'com.google.gms:google-services:4.3.0'
+        classpath 'me.tatarka:gradle-retrolambda:3.7.1'
+        classpath 'digital.wup:android-maven-publish:3.6.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:7.1.0'
+    }
+}
+
+ext {
+    playServicesVersion = '16.0.1'
+    supportAnnotationsVersion = '28.0.0'
+    gMavenRoot = 'https://dl.google.com/dl/android/maven2'
+    firebaseDefaultPreguardFile='oss/default-preguard.txt'
+    errorproneVersion = '2.3.2'
+    errorproneJavacVersion = '9+181-r4173-1'
+    googleTruthVersion = '0.40'
+
+}
+
+apply from: 'build.gradle'
+
+configure(subprojects) {
+    afterEvaluate {
+        tasks.verifyGoogleJavaFormat {
+            exclude '**/build/classes/**'
+        }
+    }
+}
+
+apply plugin: MultiProjectReleasePlugin

.idea/runConfigurations/Firestore_Unit_Tests.xml

@@ -0,0 +1,27 @@
+// 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
+//
+//      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.
+
+rootProject.name = 'com.google.firebase'
+//Note: do not add subprojects to this file. Instead add them to subprojects.gradle
+
+apply from: 'gradle/projectSettings.gradle'
+
+discoverSubprojects(file('subprojects.cfg')).each {
+  include ":$it"
+}
+
+renameBuildScripts(rootProject)
+rootProject.buildFileName = 'alternative-root-project.gradle'
+
+apply from: new File(settingsDir, 'gradle/buildCache.gradle')

alternative-root-project.gradle

@@ -15,6 +15,7 @@
 plugins {
     id "org.gradle.kotlin.kotlin-dsl" version "1.2.6"
     id "org.jlleitschuh.gradle.ktlint" version "9.2.1"
+    id 'com.github.sherter.google-java-format' version '0.9'
 }
 
 repositories {
@@ -35,18 +36,45 @@ repositories {
 // Refer go/fireperf-plugin-test-on-head for more details.
 def perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.3.4"
 
+googleJavaFormat {
+    toolVersion = '1.7'
+}
+tasks.googleJavaFormat {
+    source '.'
+    include '**/java/**/*.java'
+    exclude '**/generated/**'
+    exclude '**/package-info.java'
+}
+
+tasks.verifyGoogleJavaFormat {
+    source '.'
+    include '**/java/**/*.java'
+    exclude '**/generated/**'
+    exclude '**/package-info.java'
+}
+
 dependencies {
     // Firebase performance plugin, it should be added here because of how gradle dependency
     // resolution works, otherwise it breaks Fireperf Test Apps.
     // See https://github.com/gradle/gradle/issues/12286
     implementation "com.google.firebase:perf-plugin:$perfPluginVersion"
 
     implementation 'org.jsoup:jsoup:1.11.2'
+    implementation "com.google.auto.value:auto-value-annotations:1.6.6"
+    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
     implementation 'digital.wup:android-maven-publish:3.6.2'
     implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
     implementation 'org.json:json:20180813'
     implementation 'io.opencensus:opencensus-api:0.18.0'
     implementation 'io.opencensus:opencensus-exporter-stats-stackdriver:0.18.0'
+    implementation "org.eclipse.aether:aether-api:1.0.0.v20140518"
+    implementation "org.eclipse.aether:aether-util:1.0.0.v20140518"
+    implementation "org.eclipse.aether:aether-impl:1.0.0.v20140518"
+    implementation "org.eclipse.aether:aether-connector-basic:1.0.0.v20140518"
+    implementation "org.eclipse.aether:aether-transport-file:1.0.0.v20140518"
+    implementation "org.eclipse.aether:aether-transport-http:1.0.0.v20140518"
+    implementation "org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518"
+    implementation "org.apache.maven:maven-aether-provider:3.1.0"
     runtime 'io.opencensus:opencensus-impl:0.18.0'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
     implementation 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g013-9b8280a'
@@ -65,6 +93,10 @@ gradlePlugin {
             id = 'LicenseResolverPlugin'
             implementationClass = 'com.google.firebase.gradle.plugins.license.LicenseResolverPlugin'
         }
+        multiProjectReleasePlugin {
+            id = 'MultiProjectReleasePlugin'
+            implementationClass = 'com.google.firebase.gradle.MultiProjectReleasePlugin'
+        }
         publishingPlugin {
             id = 'PublishingPlugin'
             implementationClass = 'com.google.firebase.gradle.plugins.publish.PublishingPlugin'

alternative-settings.gradle

@@ -0,0 +1,46 @@
+# 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
+#
+#      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.
+
+set -x
+#!/bin/sh -x
+grep -rl 'http://' | xargs sed -i 's|http://|//|g'
+grep -rl 'https://' | xargs sed -i 's|https://|//|g'
+grep -rl 'reference/com/google/' | xargs sed -i 's|reference/com/google/|/docs/reference/android/com/google/|g'
+grep -rl '//developers.google.com/android//docs/reference/android/' | xargs sed -i 's|//developers.google.com/android//docs/reference/android/|//developers.google.com/android/reference/|g'
+grep -rl '//developers.google.com/android/reference/com/google/firebase/' | xargs sed -i 's|//developers.google.com/android/reference/com/google/firebase/|/docs/reference/android/com/google/firebase/|g'
+grep -rl 'href="reference' | xargs sed -i 's|href="reference|href="/docs/reference/android/|g'
+grep -rl '/docs/reference/android///developers.google.com/android/reference/' | xargs sed -i 's|/docs/reference/android///developers.google.com/android/reference/|/docs/reference/android/|g'
+grep -rl '/docs/reference/android///developer.android.com/reference/' | xargs sed -i 's|/docs/reference/android///developer.android.com/reference/|//developer.android.com/reference/|g'
+grep -rl '/docs/reference/android//docs/reference/android/' | xargs sed -i 's|/docs/reference/android//docs/reference/android/|/docs/reference/android/|g'
+find . -name '*.html' | xargs sed -i 's/[ \t]*$//' "$@"
+# TODO(b/37810114): Remove this hack once b/64612004 is fixed and propagated to our javadoc.
+find . -name '*.html' | xargs perl -0777 -p -i -e 's|.+<div class="jd-tagdata">\n(.*\n){1,5}?(?:.+<tr>\n.+\n.+<td><!-- no parameter comment --></td>\n.+</tr>\n)+?(.+\n){1,5}?.*</div>||gm'
+find . -name '_toc.yaml' | xargs sed -i 's|"com\.google\.firebase|"firebase|g'
+find . -name '_toc.yaml' | xargs sed -i 's|"com\.goo  gle\.android\.gms\.|"|g'
+find . -name "_toc.yaml" | xargs sed -i 's|path: reference/|path: /docs/reference/android/|g'
+
+#Delete blank lines
+find . -name "_toc.yaml" | xargs sed -i 's/[ \t]*$//'
+
+#Delete newline after section:
+find . -name "_toc.yaml" | xargs sed -i -z 's/section:\n\n+/section:\n/g'
+
+#Delete whitestapes after toc sections
+find . -name "_toc.yaml" | xargs sed -i 's|section: |section:|g'
+
+#Delete blank lines at the top of a file
+find . -name "_toc.yaml" | xargs sed -i '/./,$!d'
+
+#Delete all kotlin javadoc
+rm -rf "ktx/"

buildSrc/build.gradle

@@ -0,0 +1,48 @@
+# 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
+#
+#      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.
+
+set -x
+#!/bin/sh -x
+grep -rl 'http://' | xargs sed -i 's|http://|//|g'
+grep -rl 'https://' | xargs sed -i 's|https://|//|g'
+grep -rl '/docs/reference/android///developers.google.com/' | xargs sed -i 's|/docs/reference/android///developers.google.com||g'
+grep -rl '/docs/reference/android/reference' | xargs sed -i 's|/docs/reference/android/reference|/android/reference|g'
+grep -rl '//developers.google.com/android/reference/com/google/firebase/' | xargs sed -i 's|//developers.google.com/android/reference/com/google/firebase/|/android/reference/com/google/firebase/|g'
+grep -rl '/docs/reference/android///developer.android.com/reference/' | xargs sed -i 's|/docs/reference/android///developer.android.com/reference/|//developer.android.com/reference/|g'
+find . -name '*.html' | xargs sed -i 's/[ \t]*$//' "$@"
+find . -name '*.html' | xargs perl -0777 -p -i -e 's|.+<div class="jd-tagdata">\n(.*\n){1,5}?(?:.+<tr>\n.+\n.+<td><!-- no parameter comment --></td>\n.+</tr>\n)+?(.+\n){1,5}?.*</div>||gm'
+find . -name '_toc.yaml' | xargs sed -i 's|"com\.google\.firebase|"firebase|g'
+find . -name '_toc.yaml' | xargs sed -i 's|"com\.google\.android\.gms\.|"|g'i
+find . -name "_toc.yaml" | xargs sed -i 's|path: reference/|path: /android/reference/|g'
+find . -name "_toc.yaml" | xargs sed -i 's|path: /docs/reference/android/|path: /android/reference/|g'
+
+#Delete blank lines
+find . -name "_toc.yaml" | xargs sed -i 's/[ \t]*$//'
+
+#Path substitutions after cl/273770926
+find . -name '*.html' | xargs sed -i 's/\/_project.yaml/\/android\/_project.yaml/'
+
+#Delete newline after section:
+find . -name "_toc.yaml" | xargs sed -i -z 's/section:\n\n+/section:\n/g'
+
+#Path substitution after cl/273770926
+find . -name '*.html' | xargs sed -i 's|/docs/reference/_book.yaml|/android/_book.yaml|g'
+
+#Delete whitespaces after section
+find . -name "_toc.yaml" | xargs sed -i 's|section: |section:|g'
+
+#Delete blank lines at top of file
+find . -name "_toc.yaml" | xargs sed -i '/./,$!d'
+
+rm -rf "ktx/"