From fecedc51fa47ffd35e63ce2ddf0803b5b47f7b04 Mon Sep 17 00:00:00 2001 From: littledog Date: Mon, 26 Feb 2024 16:51:22 +0800 Subject: [PATCH 1/3] Use license name for license information when the license url is not available --- .../android/gms/oss/licenses/plugin/LicensesTask.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy index 851846b5..6a5b42c7 100644 --- a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy +++ b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy @@ -260,9 +260,12 @@ abstract class LicensesTask extends DefaultTask { new Dependency("${licenseKey} ${licenseName}", libraryName), licenseUrl.getBytes(UTF_8)) } - } else { + } else if (rootNode.licenses.license.url) { String nodeUrl = rootNode.licenses.license.url appendDependency(new Dependency(licenseKey, libraryName), nodeUrl.getBytes(UTF_8)) + } else { + String licenseName = rootNode.licenses.license.name + appendDependency(new Dependency(licenseKey, libraryName), licenseName.getBytes(UTF_8)) } } From 78e4fc333b2aeb6e960547c7fc2617e4fe69d271 Mon Sep 17 00:00:00 2001 From: littledog Date: Mon, 26 Feb 2024 17:10:19 +0800 Subject: [PATCH 2/3] update --- .../gms/oss/licenses/plugin/LicensesTask.groovy | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy index 6a5b42c7..4fe73429 100644 --- a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy +++ b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy @@ -260,12 +260,16 @@ abstract class LicensesTask extends DefaultTask { new Dependency("${licenseKey} ${licenseName}", libraryName), licenseUrl.getBytes(UTF_8)) } - } else if (rootNode.licenses.license.url) { - String nodeUrl = rootNode.licenses.license.url - appendDependency(new Dependency(licenseKey, libraryName), nodeUrl.getBytes(UTF_8)) } else { - String licenseName = rootNode.licenses.license.name - appendDependency(new Dependency(licenseKey, libraryName), licenseName.getBytes(UTF_8)) + if (rootNode.licenses.license.url?.isEmpty()) { + println("hojiang url: " + libraryName + ", " + rootNode.licenses.license.url + ", " + rootNode.licenses.license.name + ", " + (rootNode.licenses.license.url.size())) + String nodeUrl = rootNode.licenses.license.url + appendDependency(new Dependency(licenseKey, libraryName), nodeUrl.getBytes(UTF_8)) + } else { + println("hojiang name: " + libraryName + ", " + rootNode.licenses.license.url + ", " + rootNode.licenses.license.name + ", " + (rootNode.licenses.license.url.size())) + String licenseName = rootNode.licenses.license.name + appendDependency(new Dependency(licenseKey, libraryName), licenseName.getBytes(UTF_8)) + } } } From f45de380b36300a8115b4016c623c37af335943f Mon Sep 17 00:00:00 2001 From: littledog Date: Mon, 26 Feb 2024 19:32:10 +0800 Subject: [PATCH 3/3] remove log --- .../gms/oss/licenses/plugin/LicensesTask.groovy | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy index 4fe73429..32e2122c 100644 --- a/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy +++ b/oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy @@ -260,16 +260,12 @@ abstract class LicensesTask extends DefaultTask { new Dependency("${licenseKey} ${licenseName}", libraryName), licenseUrl.getBytes(UTF_8)) } + } else if (!rootNode.licenses.license.url?.isEmpty()) { + String nodeUrl = rootNode.licenses.license.url + appendDependency(new Dependency(licenseKey, libraryName), nodeUrl.getBytes(UTF_8)) } else { - if (rootNode.licenses.license.url?.isEmpty()) { - println("hojiang url: " + libraryName + ", " + rootNode.licenses.license.url + ", " + rootNode.licenses.license.name + ", " + (rootNode.licenses.license.url.size())) - String nodeUrl = rootNode.licenses.license.url - appendDependency(new Dependency(licenseKey, libraryName), nodeUrl.getBytes(UTF_8)) - } else { - println("hojiang name: " + libraryName + ", " + rootNode.licenses.license.url + ", " + rootNode.licenses.license.name + ", " + (rootNode.licenses.license.url.size())) - String licenseName = rootNode.licenses.license.name - appendDependency(new Dependency(licenseKey, libraryName), licenseName.getBytes(UTF_8)) - } + String licenseName = rootNode.licenses.license.name + appendDependency(new Dependency(licenseKey, libraryName), licenseName.getBytes(UTF_8)) } }