From 129f2a77b372c5c4c6fb88218d63d803c3bc5e46 Mon Sep 17 00:00:00 2001 From: Matthew Robertson Date: Fri, 26 Sep 2025 14:37:19 -0400 Subject: [PATCH 1/2] Fix license for vendored dagger2 --- firebase-functions/firebase-functions.gradle.kts | 5 +++++ firebase-functions/third_party/dagger2/LICENSE | 13 +++++++++++++ firebase-sessions/firebase-sessions.gradle.kts | 5 +++++ firebase-sessions/third_party/dagger2/LICENSE | 13 +++++++++++++ 4 files changed, 36 insertions(+) create mode 100644 firebase-functions/third_party/dagger2/LICENSE create mode 100644 firebase-sessions/third_party/dagger2/LICENSE diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts index 5a9e8f74a31..32857c1d8a2 100644 --- a/firebase-functions/firebase-functions.gradle.kts +++ b/firebase-functions/firebase-functions.gradle.kts @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { + id("LicenseResolverPlugin") id("firebase-library") id("kotlin-android") id("firebase-vendor") @@ -61,6 +62,10 @@ kotlin { explicitApi() } +thirdPartyLicenses { + add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") +} + dependencies { javadocClasspath("org.codehaus.mojo:animal-sniffer-annotations:1.21") javadocClasspath(libs.autovalue.annotations) diff --git a/firebase-functions/third_party/dagger2/LICENSE b/firebase-functions/third_party/dagger2/LICENSE new file mode 100644 index 00000000000..0567528a5c2 --- /dev/null +++ b/firebase-functions/third_party/dagger2/LICENSE @@ -0,0 +1,13 @@ +Copyright 2012 The Dagger Authors + +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. diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts index 9db21849ce1..00d3a62f148 100644 --- a/firebase-sessions/firebase-sessions.gradle.kts +++ b/firebase-sessions/firebase-sessions.gradle.kts @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { + id("LicenseResolverPlugin") id("firebase-library") id("firebase-vendor") id("kotlin-android") @@ -66,6 +67,10 @@ kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } } +thirdPartyLicenses { + add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") +} + dependencies { api(libs.firebase.common) diff --git a/firebase-sessions/third_party/dagger2/LICENSE b/firebase-sessions/third_party/dagger2/LICENSE new file mode 100644 index 00000000000..0567528a5c2 --- /dev/null +++ b/firebase-sessions/third_party/dagger2/LICENSE @@ -0,0 +1,13 @@ +Copyright 2012 The Dagger Authors + +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. From 58b9e85f68f46adae4ee3495880e2adc40ea9376 Mon Sep 17 00:00:00 2001 From: Matthew Robertson Date: Fri, 26 Sep 2025 15:14:09 -0400 Subject: [PATCH 2/2] Format --- firebase-functions/firebase-functions.gradle.kts | 4 +--- firebase-sessions/firebase-sessions.gradle.kts | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts index 32857c1d8a2..a879c13a4b4 100644 --- a/firebase-functions/firebase-functions.gradle.kts +++ b/firebase-functions/firebase-functions.gradle.kts @@ -62,9 +62,7 @@ kotlin { explicitApi() } -thirdPartyLicenses { - add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") -} +thirdPartyLicenses { add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") } dependencies { javadocClasspath("org.codehaus.mojo:animal-sniffer-annotations:1.21") diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts index 00d3a62f148..b84e4ab8af6 100644 --- a/firebase-sessions/firebase-sessions.gradle.kts +++ b/firebase-sessions/firebase-sessions.gradle.kts @@ -67,9 +67,7 @@ kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } } -thirdPartyLicenses { - add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") -} +thirdPartyLicenses { add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") } dependencies { api(libs.firebase.common)