Download scanners if they're not exist.

jfrog · Nov 9, 2023 · 3843ce1 · 3843ce1
1 parent f596b37
commit 3843ce1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,16 +49,12 @@ repositories {
 }
 
 def buildInfoVersion = '2.41.6'
-def idePluginsCommonVersion = '2.3.0'
+def idePluginsCommonVersion = '2.3.1'
 
 dependencies {
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2'
     implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor', version: buildInfoVersion
-    implementation('com.jfrog.ide:ide-plugins-common') {
-        version {
-            branch = 'air-gap-support'
-        }
-    }
+    implementation group: 'com.jfrog.ide', name: 'ide-plugins-common', version: idePluginsCommonVersion
     implementation group: 'org.jfrog.buildinfo', name: 'build-info-client', version: buildInfoVersion
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.2'
     implementation group: 'org.jfrog.buildinfo', name: 'build-info-api', version: buildInfoVersion

diff --git a/settings.gradle b/settings.gradle
@@ -7,10 +7,4 @@ pluginManagement {
     }
 }
 
-sourceControl {
-    gitRepository("https://github.com/asafgabai/ide-plugins-common.git") {
-        producesModule("com.jfrog.ide:ide-plugins-common")
-    }
-}
-
 rootProject.name = 'jfrog-idea-plugin'
diff --git a/src/main/java/com/jfrog/ide/idea/scan/ScanBinaryExecutor.java b/src/main/java/com/jfrog/ide/idea/scan/ScanBinaryExecutor.java
@@ -192,14 +192,15 @@ private void updateBinaryIfNeeded() throws IOException {
         // Allow only one thread to check and update the binary at any time.
         synchronized (downloadLock) {
             LocalDateTime currentTime = LocalDateTime.now();
-            if (nextUpdateCheck != null && currentTime.isBefore(nextUpdateCheck)) {
+            boolean targetExists = Files.exists(binaryTargetPath);
+            if (targetExists && nextUpdateCheck != null && currentTime.isBefore(nextUpdateCheck)) {
                 return;
             }
             ServerConfig server = GlobalSettings.getInstance().getServerConfig();
             String externalResourcesRepo = server.getExternalResourcesRepo();
             ArtifactoryManagerBuilder artifactoryManagerBuilder = createManagerBuilder(StringUtils.isEmpty(externalResourcesRepo), server);
             try (ArtifactoryManager artifactoryManager = artifactoryManagerBuilder.build()) {
-                if (Files.exists(binaryTargetPath)) {
+                if (targetExists) {
                     // Check for new version of the binary
                     try (FileInputStream archiveBinaryFile = new FileInputStream(archiveTargetPath.toFile())) {
                         String latestBinaryChecksum = getFileChecksumFromServer(artifactoryManager, externalResourcesRepo);