Cancel modifications to ToolsLocator

google · Nov 17, 2023 · a0cb402 · a0cb402
1 parent 8242dee
commit a0cb402
Showing 1 changed file with 7 additions and 21 deletions.
diff --git 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<String> parts = artifactParts(locator.artifact)
     (groupId, artifact, version, classifier, extension) = [parts[0], parts[1], parts[2], parts[3], parts[4]]
-
-    String mainClass = locator.mainClass
-    Map<String, String> 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<String, String> 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())
   }