From a0cb402f32c28822c72855ee3c9764a7fdfbae9b Mon Sep 17 00:00:00 2001 From: 16K <767743748@qq.com> Date: Fri, 17 Nov 2023 10:55:21 +0800 Subject: [PATCH] Cancel modifications to ToolsLocator --- .../protobuf/gradle/ToolsLocator.groovy | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/groovy/com/google/protobuf/gradle/ToolsLocator.groovy b/src/main/groovy/com/google/protobuf/gradle/ToolsLocator.groovy index 628a65b2..b50fe1b5 100644 --- a/src/main/groovy/com/google/protobuf/gradle/ToolsLocator.groovy +++ b/src/main/groovy/com/google/protobuf/gradle/ToolsLocator.groovy @@ -100,27 +100,13 @@ class ToolsLocator { OsDetector osdetector = project.extensions.getByName("osdetector") as OsDetector List parts = artifactParts(locator.artifact) (groupId, artifact, version, classifier, extension) = [parts[0], parts[1], parts[2], parts[3], parts[4]] - - String mainClass = locator.mainClass - Map notation; - if (mainClass == null) { - notation = [ - group:groupId, - name:artifact, - version:version, - classifier:classifier ?: osdetector.classifier, - ext:extension ?: 'exe', - ] - }else { - notation = [ - group:groupId, - name:artifact, - version:version, - classifier:classifier ?: null, - ext:extension ?: 'jar', - ] - } - + Map notation = [ + group:groupId, + name:artifact, + version:version, + classifier:classifier ?: osdetector.classifier, + ext:extension ?: 'exe', + ] project.dependencies.add(config.name, notation) locator.resolve(config, "$groupId:$artifact:$version".toString()) }