Use the more common stdlib dep now that we ship java8 bytecode. (#4002)

vkryachko · web-flow · commit eb4d215b5d8b · 2022-08-17T11:06:42.000-04:00
Additionally fix pom dependency type resolution.
diff --git a/appcheck/firebase-appcheck/ktx/ktx.gradle b/appcheck/firebase-appcheck/ktx/ktx.gradle
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Dokka.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Dokka.java
@@ -57,6 +57,10 @@ static void configure(
 
     Configuration javadocClasspath = project.getConfigurations().create("javadocClasspath");
     project.getDependencies().add("javadocClasspath", "com.google.code.findbugs:jsr305:3.0.2");
+    project
+        .getDependencies()
+        .add("javadocClasspath", "com.google.errorprone:error_prone_annotations:2.15.0");
+
     if (android != null) {
       javadocClasspath
           .getAttributes()
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Publisher.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Publisher.java
@@ -105,7 +105,7 @@ private static void processDependencies(FirebaseLibraryExtension library, Elemen
       }
 
       Element type = dep.getOwnerDocument().createElement("type");
-      type.setTextContent(deps.get(groupId + ":" + artifactId));
+      type.setTextContent(deps.getOrDefault(groupId + ":" + artifactId, "jar"));
       dep.appendChild(type);
 
       NodeList scopes = dep.getElementsByTagName("scope");
diff --git a/firebase-appdistribution-api/ktx/ktx.gradle b/firebase-appdistribution-api/ktx/ktx.gradle
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
@@ -75,7 +75,7 @@ dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
     // needed for Kotlin detection to compile, but not necessarily present at runtime.
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/firebase-config/ktx/ktx.gradle b/firebase-config/ktx/ktx.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-crashlytics/ktx/ktx.gradle b/firebase-crashlytics/ktx/ktx.gradle
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-database/ktx/ktx.gradle b/firebase-database/ktx/ktx.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-dynamic-links/ktx/ktx.gradle b/firebase-dynamic-links/ktx/ktx.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-firestore/ktx/ktx.gradle b/firebase-firestore/ktx/ktx.gradle
@@ -49,7 +49,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation project(':firebase-common')
     implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
diff --git a/firebase-functions/ktx/ktx.gradle b/firebase-functions/ktx/ktx.gradle
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-inappmessaging-display/ktx/ktx.gradle b/firebase-inappmessaging-display/ktx/ktx.gradle
@@ -43,7 +43,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-inappmessaging/ktx/ktx.gradle b/firebase-inappmessaging/ktx/ktx.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-common:ktx')
diff --git a/firebase-installations/ktx/ktx.gradle b/firebase-installations/ktx/ktx.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-common:ktx')
diff --git a/firebase-messaging/ktx/ktx.gradle b/firebase-messaging/ktx/ktx.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-common:ktx')
diff --git a/firebase-ml-modeldownloader/ktx/ktx.gradle b/firebase-ml-modeldownloader/ktx/ktx.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-common:ktx')
diff --git a/firebase-perf/ktx/ktx.gradle b/firebase-perf/ktx/ktx.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')
diff --git a/firebase-storage/ktx/ktx.gradle b/firebase-storage/ktx/ktx.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     implementation project(':firebase-common')
     implementation project(':firebase-components')

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`54`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`55`	`55`
`56`	`56`	`implementation project(':firebase-common')`
`57`	`57`	`implementation project(':firebase-components')`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private static void processDependencies(FirebaseLibraryExtension library, Elemen`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`Element type = dep.getOwnerDocument().createElement("type");`
`108`		`- type.setTextContent(deps.get(groupId + ":" + artifactId));`
	`108`	`+ type.setTextContent(deps.getOrDefault(groupId + ":" + artifactId, "jar"));`
`109`	`109`	`dep.appendChild(type);`
`110`	`110`
`111`	`111`	`NodeList scopes = dep.getElementsByTagName("scope");`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ android {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`dependencies {`
`45`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`45`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`46`	`46`
`47`	`47`	`implementation project(':firebase-common')`
`48`	`48`	`implementation project(':firebase-components')`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ android {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`dependencies {`
`47`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`47`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`48`	`48`
`49`	`49`	`implementation project(':firebase-common')`
`50`	`50`	`implementation project(':firebase-components')`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ tasks.withType(Test) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`52`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`53`	`53`	`implementation project(':firebase-common')`
`54`	`54`	`implementation project(':firebase-components')`
`55`	`55`	`implementation project(':firebase-common:ktx')`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ android {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`dependencies {`
`46`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`46`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`47`	`47`
`48`	`48`	`implementation project(':firebase-common')`
`49`	`49`	`implementation project(':firebase-components')`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ android {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`dependencies {`
`44`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`44`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`45`	`45`
`46`	`46`	`implementation project(':firebase-common')`
`47`	`47`	`implementation project(':firebase-common:ktx')`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ android {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`dependencies {`
`56`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
	`56`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
`57`	`57`
`58`	`58`	`implementation project(':firebase-common')`
`59`	`59`	`implementation project(':firebase-components')`