From fb5e201fcc75e101e9e41cf6902159490f6e34fa Mon Sep 17 00:00:00 2001 From: Jamie Sanson Date: Tue, 23 Sep 2025 10:52:08 +0100 Subject: [PATCH 1/2] Wire `LicensesTask` to Android resources sourceset This fixes #346 --- .../android/gms/oss/licenses/plugin/OssLicensesPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/OssLicensesPlugin.groovy b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/OssLicensesPlugin.groovy index f4bce952..5f96101a 100644 --- a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/OssLicensesPlugin.groovy +++ b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/OssLicensesPlugin.groovy @@ -57,7 +57,7 @@ class OssLicensesPlugin implements Plugin { it.dependenciesJson.set(dependencyTask.flatMap { it.dependenciesJson }) } project.logger.debug("Registered task ${licenseTask.name}") - variant.sources.resources.addGeneratedSourceDirectory(licenseTask, LicensesTask::getGeneratedDirectory) + variant.sources.res.addGeneratedSourceDirectory(licenseTask, LicensesTask::getGeneratedDirectory) TaskProvider cleanupTask = project.tasks.register( "${variant.name}OssLicensesCleanUp", From 1c7025e84aa2a60853b04433c4e97ea6f7bfcbb1 Mon Sep 17 00:00:00 2001 From: jamiesanson Date: Tue, 23 Sep 2025 10:59:35 +0100 Subject: [PATCH 2/2] Update directory used in tests --- .../com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt b/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt index 64050fde..0b4f29b9 100644 --- a/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt +++ b/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt @@ -89,7 +89,7 @@ class EndToEndTest(private val agpVersion: String, private val gradleVersion: St Assert.assertEquals(expectedDependenciesJson(isBuiltInKotlinEnabled()), dependenciesJson.readText()) val metadata = - File(projectDir, "build/generated/resources/releaseOssLicensesTask/raw/third_party_license_metadata") + File(projectDir, "build/generated/res/releaseOssLicensesTask/raw/third_party_license_metadata") Assert.assertEquals(expectedContents(isBuiltInKotlinEnabled()), metadata.readText()) val cleanResult = GradleRunner.create()