snyk 1.978.0 → 1.979.0

package/dist/cli/thirdPartyNotice.json

@@ -2475,10 +2475,10 @@
   },
   {
     "name": "snyk-gradle-plugin",
-    "version": "3.21.0",
+    "version": "3.21.1",
     "author": "snyk.io",
     "repository": "https://github.com/snyk/snyk-gradle-plugin",
-    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.21.0.tgz",
+    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.21.1.tgz",
     "license": "Apache-2.0",
     "licenseText": "Copyright 2017 Snyk Ltd.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n"
   },

package/dist/lib/init.gradle

@@ -171,11 +171,18 @@ def findProjectConfigs(proj, confNameFilter, confAttrSpec) {
     proj.configurations.each({ debugLog("conf.name=$it.name; conf.canBeResolved=$it.canBeResolved; conf.canBeConsumed=$it.canBeConsumed") })
     // We are looking for a configuration that `canBeResolved`, because it's a configuration for which 
     // we can compute a dependency graph and that contains all the necessary information for resolution to happen.
-    // if we cannot find dependencies that can be only resolved but not consumable
-    // we try to find configs that are simultaneously resolvable and consumable
-    // to prevent dependency resolution conflicts (e.g. Cannot choose between the following variants) 
-    // we avoid the coexistence of (canBeResolved: true, canBeConsumed: false) and (canBeResolved: true, canBeConsumed: true) configs
-    def resolvable = matching.findAll({ it.canBeResolved == true })
+    // See Gradle docs: https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs
+    def resolvable = []
+    matching.each({ it ->
+        if (!it.canBeResolved) { return }
+        try {
+            // Try accessing resolvedConfiguration to filter out configs that may cause issues in strict lock mode  
+            it.resolvedConfiguration
+            resolvable.add(it)
+        } catch (Exception ex) {
+            // Swallow the error
+        }
+    })
     debugLog("resolvableConfigs=$resolvable")
     return resolvable
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snyk",
-  "version": "1.978.0",
+  "version": "1.979.0",
   "description": "snyk library and cli utility",
   "files": [
     "help/cli-commands",