From 8650306e1ddbc0ec620023eb2c2da4fbc4bc5b3a Mon Sep 17 00:00:00 2001
From: 37IulianPopovici <iulian.popovici@snyk.io>
Date: Fri, 12 Jan 2024 15:18:53 +0200
Subject: [PATCH] feat: added support for gradle 8

---
 .circleci/config.yml                          | 32 ++++++++++-
 README.md                                     |  7 +--
 lib/index.ts                                  |  3 +-
 .../kts-basic-with-deps/build.gradle.kts      |  4 +-
 .../build.gradle.kts                          |  4 +-
 .../kts-strict-lock-mode/build.gradle.kts     |  4 +-
 .../build.gradle                              | 50 ++++++++---------
 .../build.gradle                              | 54 +++++++------------
 test/fixtures/gradle-kts/build.gradle.kts     | 35 ++++++------
 .../malformed-build-gradle/build.gradle       |  1 -
 .../build.gradle                              |  5 +-
 .../multi-config-attributes/build.gradle      |  3 +-
 test/fixtures/multi-config/build.gradle       | 42 ++++++---------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../subproj/build.gradle                      | 32 +++++------
 .../build.gradle                              |  3 +-
 .../subproj/build.gradle                      | 34 +++++-------
 .../greeter/lib/build.gradle                  |  2 +-
 .../lib-top/build.gradle                      |  2 +-
 .../multi-project-parallel/build.gradle       |  2 +-
 .../subproj0/build.gradle                     |  2 +-
 .../subproj1/build.gradle                     |  2 +-
 .../subproj2/build.gradle                     |  2 +-
 .../subproj3/build.gradle                     |  2 +-
 .../subproj4/build.gradle                     |  2 +-
 .../greeter/lib/build.gradle                  |  2 +-
 .../multi-project-same-name/lib/build.gradle  |  2 +-
 .../subproj-fail/build.gradle                 | 15 ++++--
 .../subproj/build.gradle                      | 32 +++++------
 .../multi-project/subproj/build.gradle        | 38 +++++--------
 test/fixtures/no wrapper/build.gradle         | 30 ++++-------
 .../lib/build.gradle                          |  2 +-
 test/fixtures/with-init-script/build.gradle   |  8 +--
 test/functional/gradle-plugin.spec.ts         | 43 ++++++++-------
 test/system/failure-states.test.ts            |  2 +-
 test/system/kotlin.test.ts                    | 24 +++++----
 test/system/multi-module.test.ts              | 44 +--------------
 test/system/plugin.test.ts                    |  6 +--
 38 files changed, 253 insertions(+), 326 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0b6cd5..58fc80f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,14 @@ test_matrix_unix: &test_matrix_unix
     parameters:
       node_version: [ '16.18', '18.18', '20.9' ]
       jdk_version: [ '8.0.292.j9-adpt' ]
-      gradle_version: [ '4.10', '5.5', '6.2.1' ]
+      gradle_version: [ '4.10', '5.5', '6.2.1']
+
+test_matrix_unix_new_versions: &test_matrix_unix_new_versions
+  matrix:
+    parameters:
+      node_version: [ '16.18', '18.18', '20.9' ]
+      jdk_version: [ '17.0.9-jbr' ]
+      gradle_version: [ '7.3', '8.4' ]
 
 test_matrix_win: &test_matrix_win
   matrix:
@@ -38,6 +45,13 @@ test_matrix_win: &test_matrix_win
       jdk_version: [ '8' ]
       gradle_version: [ '4.10', '5.5', '6.2.1' ]
 
+test_matrix_win_new_versions: &test_matrix_win_new_versions
+  matrix:
+    parameters:
+      node_version: [ '16', '18', '20' ]
+      jdk_version: [ '17' ]
+      gradle_version: [ '7.3', '8.4' ]
+
 filters_branches_only_main: &filters_branches_only_main
   filters:
     branches:
@@ -264,6 +278,14 @@ workflows:
             - Lint
           <<: *filters_branches_ignore_main
 
+      - test-unix:
+          name: Test OS=Unix Node=<<matrix.node_version>> JDK=<<matrix.jdk_version>> Gradle=<<matrix.gradle_version>>
+          context: nodejs-install
+          <<: *test_matrix_unix_new_versions
+          requires:
+            - Lint
+          <<: *filters_branches_ignore_main
+
       - test-windows:
           name: Test OS=Windows Node=<<matrix.node_version>> JDK=<<matrix.jdk_version>> Gradle=<<matrix.gradle_version>>
           context: nodejs-install
@@ -272,6 +294,14 @@ workflows:
             - Lint
           <<: *filters_branches_ignore_main
 
+      - test-windows:
+          name: Test OS=Windows Node=<<matrix.node_version>> JDK=<<matrix.jdk_version>> Gradle=<<matrix.gradle_version>>
+          context: nodejs-install
+          <<: *test_matrix_win_new_versions
+          requires:
+            - Lint
+          <<: *filters_branches_ignore_main
+
       - release:
           name: Release
           context: nodejs-app-release
diff --git a/README.md b/README.md
index 0488a86..205a451 100644
--- a/README.md
+++ b/README.md
@@ -27,15 +27,15 @@ Please refer to the [Snyk for Java](https://docs.snyk.io/products/snyk-open-sour
 | ------- | --------- |
 | Windows | ✅        |
 | Linux   | ✅        |
-| OSX     | ️✅       |
+| OSX     | ️✅        |
 
 ## Supported Node versions
 
 | Node | Supported |
 | ---- | --------- |
-| 12   | ✅        |
-| 14   | ✅        |
 | 16   | ✅        |
+| 18   | ✅        |
+| 20   | ✅        |
 
 ## Supported Gradle versions
 
@@ -45,6 +45,7 @@ Please refer to the [Snyk for Java](https://docs.snyk.io/products/snyk-open-sour
 | 5      | ✅        |
 | 6      | ✅        |
 | 7      | ✅        |
+| 8      | ✅        |
 
 # Supported Snyk command line arguments:
 
diff --git a/lib/index.ts b/lib/index.ts
index 15c6461..99ec77c 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -735,7 +735,8 @@ function buildArgs(
 
   // Gradle 7 introduced configuration caching which we don't support yet
   // If it is enabled in a gradle.properties file, it can be disabled on the command line with --no-configuration-cache
-  if (gradleVersion.match(/Gradle 7/)) args.push('--no-configuration-cache');
+  if (gradleVersion.match(/Gradle 7/) || gradleVersion.match(/Gradle 8/))
+    args.push('--no-configuration-cache');
 
   // There might be a legacy --configuration option in 'args'.
   // It has been superseded by --configuration-matching option for Snyk CLI (see buildArgs),
diff --git a/test/fixtures-with-wrappers/kts-basic-with-deps/build.gradle.kts b/test/fixtures-with-wrappers/kts-basic-with-deps/build.gradle.kts
index bebb08c..bd07eed 100644
--- a/test/fixtures-with-wrappers/kts-basic-with-deps/build.gradle.kts
+++ b/test/fixtures-with-wrappers/kts-basic-with-deps/build.gradle.kts
@@ -14,8 +14,8 @@ repositories {
 }
 
 dependencies {
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	testCompile("org.jetbrains.kotlin:kotlin-reflect") {
+	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect") {
 		exclude(module = "junit")
 	}
 }
diff --git a/test/fixtures-with-wrappers/kts-configuration-consistency/build.gradle.kts b/test/fixtures-with-wrappers/kts-configuration-consistency/build.gradle.kts
index 1398570..aeae1a6 100644
--- a/test/fixtures-with-wrappers/kts-configuration-consistency/build.gradle.kts
+++ b/test/fixtures-with-wrappers/kts-configuration-consistency/build.gradle.kts
@@ -15,8 +15,8 @@ repositories {
 }
 
 dependencies {
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	testCompile("org.jetbrains.kotlin:kotlin-reflect") {
+	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect") {
 		exclude(module = "junit")
 	}
 }
diff --git a/test/fixtures-with-wrappers/kts-strict-lock-mode/build.gradle.kts b/test/fixtures-with-wrappers/kts-strict-lock-mode/build.gradle.kts
index f46dd9a..f857464 100644
--- a/test/fixtures-with-wrappers/kts-strict-lock-mode/build.gradle.kts
+++ b/test/fixtures-with-wrappers/kts-strict-lock-mode/build.gradle.kts
@@ -15,8 +15,8 @@ repositories {
 }
 
 dependencies {
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	testCompile("org.jetbrains.kotlin:kotlin-reflect") {
+	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect") {
 		exclude(module = "junit")
 	}
 }
diff --git a/test/fixtures/custom-resolution-strategy-via-all/build.gradle b/test/fixtures/custom-resolution-strategy-via-all/build.gradle
index aa9af68..6cb2487 100644
--- a/test/fixtures/custom-resolution-strategy-via-all/build.gradle
+++ b/test/fixtures/custom-resolution-strategy-via-all/build.gradle
@@ -1,55 +1,47 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
+version = '1.0.0'
 
-sourceCompatibility = 1.8 // java 8
+sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 repositories {
-  mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-  compile 'commons-discovery:commons-discovery:0.2'
-  compile 'axis:axis:1.3'
+    implementation 'commons-discovery:commons-discovery:0.2'
+    implementation 'axis:axis:1.3'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
 artifacts {
-    archives sourcesJar
-    archives javadocJar
+    archives tasks.sourcesJar
+    archives tasks.javadocJar
 }
 
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
-
-// See https://docs.gradle.org/current/userguide/customizing_dependency_resolution_behavior.html#sec:dependency_resolve_rules
 configurations.all {
-  resolutionStrategy.eachDependency { details ->
-    if (details.requested.group == 'commons-logging' && details.requested.name == 'commons-logging') {
-      details.useVersion '1.0.3'
+    resolutionStrategy.eachDependency { details ->
+        if (details.requested.group == 'commons-logging' && details.requested.name == 'commons-logging') {
+            details.useVersion '1.0.3'
+        }
     }
-  }
 }
diff --git a/test/fixtures/custom-resolution-strategy-via-asterisk/build.gradle b/test/fixtures/custom-resolution-strategy-via-asterisk/build.gradle
index 2b7c488..adce0d7 100644
--- a/test/fixtures/custom-resolution-strategy-via-asterisk/build.gradle
+++ b/test/fixtures/custom-resolution-strategy-via-asterisk/build.gradle
@@ -1,27 +1,36 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
+version = '1.0.0'
 
-sourceCompatibility = 1.8 // java 8
+sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 repositories {
-  mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-  compile 'commons-discovery:commons-discovery:0.2'
-  compile 'axis:axis:1.3'
+    implementation 'commons-discovery:commons-discovery:0.2'
+    implementation 'axis:axis:1.3'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
+    dependsOn 'javadoc'
     from javadoc.destinationDir
 }
 
@@ -30,33 +39,10 @@ artifacts {
     archives javadocJar
 }
 
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
+configurations.all {
+    resolutionStrategy.eachDependency { details ->
+        if (details.requested.group == 'commons-logging' && details.requested.name == 'commons-logging') {
+            details.useVersion '1.0.3'
         }
-      }
-    }
-  }
-}
-
-Closure versionStrategy = {
-  eachDependency { details ->
-    if (details.requested.group == 'commons-logging' && details.requested.name == 'commons-logging') {
-      details.useVersion '1.0.3'
     }
-  }
 }
-
-// See https://github.com/snyk/snyk/issues/729
-// We currently do NOT support this. Securely transplanting resolution strategy from constituent
-// configurations using Gradle APIs is pretty hard.
-// Known workarounds:
-// - use `configurations.all` syntax, as recommended by Gradle documentation
-// - scan a particular configuration using, e.g. `snyk test --configuration-matching=^compile$`
-configurations*.resolutionStrategy versionStrategy
diff --git a/test/fixtures/gradle-kts/build.gradle.kts b/test/fixtures/gradle-kts/build.gradle.kts
index 545523e..870b459 100644
--- a/test/fixtures/gradle-kts/build.gradle.kts
+++ b/test/fixtures/gradle-kts/build.gradle.kts
@@ -1,33 +1,38 @@
+import org.gradle.api.JavaVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	val kotlinVersion = "1.3.21"
-	id("org.jetbrains.kotlin.jvm") version kotlinVersion
-	id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
-	id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
+    val kotlinVersion = if (JavaVersion.current().toString() >= "17") "1.8.10" else "1.3.21"
+    kotlin("jvm") version kotlinVersion
+    kotlin("plugin.spring") version kotlinVersion
+    kotlin("plugin.jpa") version kotlinVersion
 }
 
 version = "1.0.0-SNAPSHOT"
 
 tasks.withType<KotlinCompile> {
-	kotlinOptions {
-		jvmTarget = "1.8"
-		freeCompilerArgs = listOf("-Xjsr305=strict")
-	}
+    doFirst {
+        if (JavaVersion.current().isJava8Compatible()) {
+            kotlinOptions.jvmTarget = "1.8"
+        } else {
+            kotlinOptions.jvmTarget = "17"
+        }
+        kotlinOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    }
 }
 
+
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-  // Removed Spring because too heavy
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	testCompile("org.jetbrains.kotlin:kotlin-reflect") {
-		exclude(module = "junit")
-	}
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect") {
+        exclude(module = "junit")
+    }
 }
diff --git a/test/fixtures/malformed-build-gradle/build.gradle b/test/fixtures/malformed-build-gradle/build.gradle
index 7802db2..5dd0888 100644
--- a/test/fixtures/malformed-build-gradle/build.gradle
+++ b/test/fixtures/malformed-build-gradle/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
diff --git a/test/fixtures/multi-config-attributes-subproject/build.gradle b/test/fixtures/multi-config-attributes-subproject/build.gradle
index dd82e1c..17bad08 100644
--- a/test/fixtures/multi-config-attributes-subproject/build.gradle
+++ b/test/fixtures/multi-config-attributes-subproject/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -65,10 +64,10 @@ dependencies.attributesSchema {
 
 
 dependencies {
-  compile 'com.google.guava:guava:18.0'
+  implementation 'com.google.guava:guava:18.0'
   apiConf 'commons-httpclient:commons-httpclient:3.1'
   runtimeConf 'org.apache.commons:commons-lang3:3.8.1'
-  compile project(':subproj')
+  implementation project(':subproj')
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
diff --git a/test/fixtures/multi-config-attributes/build.gradle b/test/fixtures/multi-config-attributes/build.gradle
index 255931e..659cc77 100644
--- a/test/fixtures/multi-config-attributes/build.gradle
+++ b/test/fixtures/multi-config-attributes/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -45,7 +44,7 @@ if (project.hasProperty('objects')) {
 }
 
 dependencies {
-  compile 'com.google.guava:guava:18.0'
+  implementation 'com.google.guava:guava:18.0'
   apiConf 'commons-httpclient:commons-httpclient:3.1'
   runtimeConf 'org.apache.commons:commons-lang3:3.8.1'
 }
diff --git a/test/fixtures/multi-config/build.gradle b/test/fixtures/multi-config/build.gradle
index 97b96ca..6622f93 100644
--- a/test/fixtures/multi-config/build.gradle
+++ b/test/fixtures/multi-config/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,23 +10,29 @@ repositories {
 }
 
 dependencies {
-  // Gradle 3+ will not pick up "compile" dependencies for "compileOnly"
-  // Gradle 2 will, so for configuration-matching tests we use "runtime"
-  runtime 'com.google.guava:guava:18.0'
-  runtime 'batik:batik-dom:1.6'
-  runtime 'commons-discovery:commons-discovery:0.2'
-  runtime 'axis:axis:1.3'
-  runtime 'com.android.tools.build:builder:2.3.0'
-  compileOnly 'javax.servlet:servlet-api:2.5'
+  implementation 'com.google.guava:guava:18.0'
+  implementation 'batik:batik-dom:1.6'
+  implementation 'commons-discovery:commons-discovery:0.2'
+  implementation 'axis:axis:1.3'
+  runtimeOnly 'com.android.tools.build:builder:2.3.0'
+  implementation 'javax.servlet:servlet-api:2.5'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
@@ -35,18 +40,3 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
-
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
diff --git a/test/fixtures/multi-project gradle wrapper/gradle/wrapper/gradle-wrapper.properties b/test/fixtures/multi-project gradle wrapper/gradle/wrapper/gradle-wrapper.properties
index ee69dd6..068cdb2 100644
--- a/test/fixtures/multi-project gradle wrapper/gradle/wrapper/gradle-wrapper.properties	
+++ b/test/fixtures/multi-project gradle wrapper/gradle/wrapper/gradle-wrapper.properties	
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/fixtures/multi-project gradle wrapper/subproj/build.gradle b/test/fixtures/multi-project gradle wrapper/subproj/build.gradle
index c1f70db..a21ad09 100644
--- a/test/fixtures/multi-project gradle wrapper/subproj/build.gradle	
+++ b/test/fixtures/multi-project gradle wrapper/subproj/build.gradle	
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,17 +10,25 @@ repositories {
 }
 
 dependencies {
-  compile 'commons-discovery:commons-discovery:0.2'
-  compile 'axis:axis:1.3'
+  implementation 'commons-discovery:commons-discovery:0.2'
+  implementation 'axis:axis:1.3'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
@@ -29,18 +36,3 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
-
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
diff --git a/test/fixtures/multi-project-dependency-cycle/build.gradle b/test/fixtures/multi-project-dependency-cycle/build.gradle
index f712b14..a64a737 100644
--- a/test/fixtures/multi-project-dependency-cycle/build.gradle
+++ b/test/fixtures/multi-project-dependency-cycle/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,5 +10,5 @@ repositories {
 }
 
 dependencies {
-    compile project(':subproj')
+    implementation project(':subproj')
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-dependency-cycle/subproj/build.gradle b/test/fixtures/multi-project-dependency-cycle/subproj/build.gradle
index 4fc9b23..40162cf 100644
--- a/test/fixtures/multi-project-dependency-cycle/subproj/build.gradle
+++ b/test/fixtures/multi-project-dependency-cycle/subproj/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,18 +10,26 @@ repositories {
 }
 
 dependencies {
-  compile 'com.google.guava:guava:18.0'
-  compile 'batik:batik-dom:1.6'
-  compile project(':')
+  implementation 'com.google.guava:guava:18.0'
+  implementation 'batik:batik-dom:1.6'
+  implementation project(':')
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
@@ -30,18 +37,3 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
-
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
diff --git a/test/fixtures/multi-project-different-names/greeter/lib/build.gradle b/test/fixtures/multi-project-different-names/greeter/lib/build.gradle
index 996cff5..74ae745 100644
--- a/test/fixtures/multi-project-different-names/greeter/lib/build.gradle
+++ b/test/fixtures/multi-project-different-names/greeter/lib/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.11.0'
 }
diff --git a/test/fixtures/multi-project-different-names/lib-top/build.gradle b/test/fixtures/multi-project-different-names/lib-top/build.gradle
index 13a4ca5..d9cdc01 100644
--- a/test/fixtures/multi-project-different-names/lib-top/build.gradle
+++ b/test/fixtures/multi-project-different-names/lib-top/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
 }
diff --git a/test/fixtures/multi-project-parallel/build.gradle b/test/fixtures/multi-project-parallel/build.gradle
index c14ed81..21255d3 100644
--- a/test/fixtures/multi-project-parallel/build.gradle
+++ b/test/fixtures/multi-project-parallel/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:1.5.13"
+    implementation "io.swagger:swagger-annotations:1.5.13"
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-parallel/subproj0/build.gradle b/test/fixtures/multi-project-parallel/subproj0/build.gradle
index c14ed81..21255d3 100644
--- a/test/fixtures/multi-project-parallel/subproj0/build.gradle
+++ b/test/fixtures/multi-project-parallel/subproj0/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:1.5.13"
+    implementation "io.swagger:swagger-annotations:1.5.13"
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-parallel/subproj1/build.gradle b/test/fixtures/multi-project-parallel/subproj1/build.gradle
index c14ed81..21255d3 100644
--- a/test/fixtures/multi-project-parallel/subproj1/build.gradle
+++ b/test/fixtures/multi-project-parallel/subproj1/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:1.5.13"
+    implementation "io.swagger:swagger-annotations:1.5.13"
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-parallel/subproj2/build.gradle b/test/fixtures/multi-project-parallel/subproj2/build.gradle
index c14ed81..21255d3 100644
--- a/test/fixtures/multi-project-parallel/subproj2/build.gradle
+++ b/test/fixtures/multi-project-parallel/subproj2/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:1.5.13"
+    implementation "io.swagger:swagger-annotations:1.5.13"
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-parallel/subproj3/build.gradle b/test/fixtures/multi-project-parallel/subproj3/build.gradle
index c14ed81..21255d3 100644
--- a/test/fixtures/multi-project-parallel/subproj3/build.gradle
+++ b/test/fixtures/multi-project-parallel/subproj3/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:1.5.13"
+    implementation "io.swagger:swagger-annotations:1.5.13"
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-parallel/subproj4/build.gradle b/test/fixtures/multi-project-parallel/subproj4/build.gradle
index c14ed81..21255d3 100644
--- a/test/fixtures/multi-project-parallel/subproj4/build.gradle
+++ b/test/fixtures/multi-project-parallel/subproj4/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:1.5.13"
+    implementation "io.swagger:swagger-annotations:1.5.13"
 }
\ No newline at end of file
diff --git a/test/fixtures/multi-project-same-name/greeter/lib/build.gradle b/test/fixtures/multi-project-same-name/greeter/lib/build.gradle
index 996cff5..74ae745 100644
--- a/test/fixtures/multi-project-same-name/greeter/lib/build.gradle
+++ b/test/fixtures/multi-project-same-name/greeter/lib/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.11.0'
 }
diff --git a/test/fixtures/multi-project-same-name/lib/build.gradle b/test/fixtures/multi-project-same-name/lib/build.gradle
index 13a4ca5..d9cdc01 100644
--- a/test/fixtures/multi-project-same-name/lib/build.gradle
+++ b/test/fixtures/multi-project-same-name/lib/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
 }
diff --git a/test/fixtures/multi-project-some-unscannable/subproj-fail/build.gradle b/test/fixtures/multi-project-some-unscannable/subproj-fail/build.gradle
index 7c75424..d8f5dbb 100644
--- a/test/fixtures/multi-project-some-unscannable/subproj-fail/build.gradle
+++ b/test/fixtures/multi-project-some-unscannable/subproj-fail/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,16 +10,24 @@ repositories {
 }
 
 dependencies {
-  compile 'private.inaccessible:dependency:42.1337'
+  implementation 'private.inaccessible:dependency:42.1337'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
diff --git a/test/fixtures/multi-project-some-unscannable/subproj/build.gradle b/test/fixtures/multi-project-some-unscannable/subproj/build.gradle
index a295380..44cbd86 100644
--- a/test/fixtures/multi-project-some-unscannable/subproj/build.gradle
+++ b/test/fixtures/multi-project-some-unscannable/subproj/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,17 +10,25 @@ repositories {
 }
 
 dependencies {
-  compile 'com.google.guava:guava:18.0'
-  compile 'batik:batik-dom:1.6'
+  implementation 'com.google.guava:guava:18.0'
+  implementation 'batik:batik-dom:1.6'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
@@ -29,18 +36,3 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
-
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
diff --git a/test/fixtures/multi-project/subproj/build.gradle b/test/fixtures/multi-project/subproj/build.gradle
index 301e7be..ed1a524 100644
--- a/test/fixtures/multi-project/subproj/build.gradle
+++ b/test/fixtures/multi-project/subproj/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,22 +10,28 @@ repositories {
 }
 
 dependencies {
-  // Gradle 3+ will not pick up "compile" dependencies for "compileOnly"
-  // Gradle 2 will, so for configuration-matching tests we use "runtime"
-  runtime 'com.google.guava:guava:18.0'
-  runtime 'batik:batik-dom:1.6'
-  runtime 'commons-discovery:commons-discovery:0.2'
+  implementation 'com.google.guava:guava:18.0'
+  implementation 'batik:batik-dom:1.6'
+  implementation 'commons-discovery:commons-discovery:0.2'
   compileOnly 'axis:axis:1.3'
-  runtime 'com.android.tools.build:builder:2.3.0'
+  implementation 'com.android.tools.build:builder:2.3.0'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
@@ -34,18 +39,3 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
-
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
diff --git a/test/fixtures/no wrapper/build.gradle b/test/fixtures/no wrapper/build.gradle
index bc8990a..82c58b2 100644
--- a/test/fixtures/no wrapper/build.gradle	
+++ b/test/fixtures/no wrapper/build.gradle	
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
 group = 'com.github.jitpack'
 
@@ -11,16 +10,24 @@ repositories {
 }
 
 dependencies {
-  compile 'batik:batik-dom:1.6'
+  implementation 'batik:batik-dom:1.6'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('sources')
+    } else {
+        classifier = 'sources'
+    }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    if (project.gradle.gradleVersion >= '6.3') {
+        archiveClassifier.set('javadoc')
+    } else {
+        classifier = 'javadoc'
+    }
     from javadoc.destinationDir
 }
 
@@ -28,18 +35,3 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
-
-// To specify a license in the pom:
-install {
-  repositories.mavenInstaller {
-    pom.project {
-      licenses {
-        license {
-          name 'The Apache Software License, Version 2.0'
-          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-          distribution 'repo'
-        }
-      }
-    }
-  }
-}
diff --git a/test/fixtures/subproject-with-same-name-as-root/lib/build.gradle b/test/fixtures/subproject-with-same-name-as-root/lib/build.gradle
index 9e8e605..74ef341 100644
--- a/test/fixtures/subproject-with-same-name-as-root/lib/build.gradle
+++ b/test/fixtures/subproject-with-same-name-as-root/lib/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    compile 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
 }
\ No newline at end of file
diff --git a/test/fixtures/with-init-script/build.gradle b/test/fixtures/with-init-script/build.gradle
index 72a62de..1e3f4bd 100644
--- a/test/fixtures/with-init-script/build.gradle
+++ b/test/fixtures/with-init-script/build.gradle
@@ -1,7 +1,3 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 plugins {
     id 'java'
     id 'maven-publish'
@@ -19,8 +15,8 @@ repositories {
 }
 
 dependencies {
-    compile 'commons-collections:commons-collections:3.2.1'
-    compile 'org.nd4j:nd4j-common:1.0.0-beta2'
+    implementation 'commons-collections:commons-collections:3.2.1'
+    implementation 'org.nd4j:nd4j-common:1.0.0-beta2'
 }
 
 group = 'org.example'
diff --git a/test/functional/gradle-plugin.spec.ts b/test/functional/gradle-plugin.spec.ts
index 6280397..be4aebf 100644
--- a/test/functional/gradle-plugin.spec.ts
+++ b/test/functional/gradle-plugin.spec.ts
@@ -159,25 +159,28 @@ describe('Gradle Plugin', () => {
     );
   });
 
-  it('make sure configuration cache is switched off for Gradle 7', () => {
-    const result = testableMethods.buildArgs(
-      '.',
-      null,
-      '/tmp/init.gradle',
-      {},
-      'Gradle 7',
-    );
-    expect(result).toEqual(
-      expect.arrayContaining([
-        'snykResolvedDepsJson',
-        '-q',
-        '-Dorg.gradle.parallel=',
-        '-Dorg.gradle.console=plain',
-        '-PonlySubProject=.',
-        '-I',
+  it.each([7, 8])(
+    'make sure configuration cache is switched off for Gradle %s',
+    async (version) => {
+      const result = testableMethods.buildArgs(
+        '.',
+        null,
         '/tmp/init.gradle',
-        '--no-configuration-cache',
-      ]),
-    );
-  });
+        {},
+        `Gradle ${version}`,
+      );
+      expect(result).toEqual(
+        expect.arrayContaining([
+          'snykResolvedDepsJson',
+          '-q',
+          '-Dorg.gradle.parallel=',
+          '-Dorg.gradle.console=plain',
+          '-PonlySubProject=.',
+          '-I',
+          '/tmp/init.gradle',
+          '--no-configuration-cache',
+        ]),
+      );
+    },
+  );
 });
diff --git a/test/system/failure-states.test.ts b/test/system/failure-states.test.ts
index e596259..4c13f42 100644
--- a/test/system/failure-states.test.ts
+++ b/test/system/failure-states.test.ts
@@ -11,7 +11,7 @@ test('malformed build.gradle', async () => {
       path.join(fixtureDir('malformed-build-gradle'), 'build.gradle'),
       { args: ['--configuration', 'compileClasspath'] },
     ),
-  ).rejects.toThrowError(/unexpected token/);
+  ).rejects.toThrowError(/unexpected token|Could not get unknown property/);
 });
 
 test('incorrect argument passed to inspect', async () => {
diff --git a/test/system/kotlin.test.ts b/test/system/kotlin.test.ts
index 307db0e..7e76930 100644
--- a/test/system/kotlin.test.ts
+++ b/test/system/kotlin.test.ts
@@ -6,7 +6,8 @@ const gradleVersionFromProcess: string = process.env.GRADLE_VERSION;
 const gradleVersionInUse: number = parseInt(
   gradleVersionFromProcess?.split('.')[0],
 );
-const isKotlinSupported: boolean = gradleVersionInUse < 5 ? false : true;
+const isKotlinSupported: boolean = gradleVersionInUse > 4 ? true : false;
+const kotlinVersion = gradleVersionInUse < 7 ? '1.3.21' : '1.8.10';
 
 // Gradle .kts builds are slower than usual so timeout is set to 150 sec in package.json
 if (isKotlinSupported) {
@@ -23,7 +24,7 @@ if (isKotlinSupported) {
       nodeIds.push(`${pkgs[id].name}@${pkgs[id].version}`);
     });
 
-    const expectedNodeId = 'org.jetbrains.kotlin:kotlin-stdlib-common@1.3.21';
+    const expectedNodeId = `org.jetbrains.kotlin:kotlin-stdlib-common@${kotlinVersion}`;
     expect(nodeIds).toContain(expectedNodeId);
 
     // double parsing to have access to internal depGraph data, no methods available to properly
@@ -32,17 +33,20 @@ if (isKotlinSupported) {
 
     const { deps: directDependencies } = graphObject.graph.nodes[0];
     const expectedDirectDependencies = [
-      { nodeId: 'org.jetbrains.kotlin:kotlin-stdlib-jdk8@1.3.21' },
-      { nodeId: 'org.jetbrains.kotlin:kotlin-compiler-embeddable@1.3.21' },
-      { nodeId: 'org.jetbrains.kotlin:kotlin-reflect@1.3.21' },
+      { nodeId: `org.jetbrains.kotlin:kotlin-stdlib-jdk8@${kotlinVersion}` },
       {
-        nodeId:
-          'org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable@1.3.21',
+        nodeId: `org.jetbrains.kotlin:kotlin-compiler-embeddable@${kotlinVersion}`,
       },
-      { nodeId: 'org.jetbrains.kotlin:kotlin-allopen@1.3.21' },
-      { nodeId: 'org.jetbrains.kotlin:kotlin-noarg@1.3.21' },
+      { nodeId: `org.jetbrains.kotlin:kotlin-reflect@${kotlinVersion}` },
+      {
+        nodeId: `org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable@${kotlinVersion}`,
+      },
+      { nodeId: `org.jetbrains.kotlin:kotlin-allopen@${kotlinVersion}` },
+      { nodeId: `org.jetbrains.kotlin:kotlin-noarg@${kotlinVersion}` },
     ];
-    expect(directDependencies).toEqual(expectedDirectDependencies);
+    expectedDirectDependencies.forEach((expectedDependency) => {
+      expect(directDependencies).toContainEqual(expectedDependency);
+    });
   }, 200000);
 } else {
   test('build.gradle.kts are not supported with Gradle version < 5', () => {});
diff --git a/test/system/multi-module.test.ts b/test/system/multi-module.test.ts
index 7fce28c..69bdaba 100644
--- a/test/system/multi-module.test.ts
+++ b/test/system/multi-module.test.ts
@@ -119,7 +119,7 @@ if (wrapperIsCompatibleWithJvm) {
     );
     expect(result.dependencyGraph.rootPkg.name).toBe('root-proj');
     expect(result.meta!.gradleProjectName).toBe('root-proj');
-    expect(result.meta!.versionBuildInfo!.gradleVersion).toBe('5.4.1');
+    expect(result.meta!.versionBuildInfo!.gradleVersion).toBe('7.6.3');
     expect(result.plugin.meta!.allSubProjectNames).toEqual(['subproj']);
     // double parsing to have access to internal depGraph data, no methods available to properly
     // return the deps nodeIds list that belongs to a node
@@ -304,48 +304,6 @@ test('multi-project: parallel with allSubProjects produces multiple results with
   );
 });
 
-test('multi-project: allSubProjects + configuration', async () => {
-  const result = await inspect('.', path.join(multiProject, 'build.gradle'), {
-    allSubProjects: true,
-    args: ['--configuration', 'compileClasspath'],
-  });
-  // It's an array, so we have to scan
-  expect(result.scannedProjects.length).toBe(2);
-  for (const p of result.scannedProjects) {
-    if (p.depGraph.rootPkg.name === 'root-proj') {
-      expect(p.meta!.gradleProjectName).toBe('root-proj');
-
-      // double parsing to have access to internal depGraph data, no methods available to properly
-      // return the deps nodeIds list that belongs to a node
-      const graphObject: any = JSON.parse(JSON.stringify(p.depGraph));
-      // no dependencies for the main depRoot
-      expect(graphObject.graph.nodes[0].deps.length).toBe(0);
-      expect(p.targetFile).toBeFalsy(); // see targetFileFilteredForCompatibility
-      // TODO(kyegupov): when the project name issue is solved, change the assertion to:
-      // expect(p.targetFile, 'multi-project' + dirSep + 'build.gradle', 'correct targetFile for the main depRoot');
-    } else {
-      // sub project name is included in the root pkg name
-      expect(p.depGraph.rootPkg.name).toBe('root-proj/subproj');
-      // new sub project name is included in the root pkg name
-      expect(p.meta!.gradleProjectName).toBe('root-proj/subproj');
-
-      const pkgs = p.depGraph.getDepPkgs();
-      const nodeIds: string[] = [];
-      Object.keys(pkgs).forEach((id) => {
-        nodeIds.push(`${pkgs[id].name}@${pkgs[id].version}`);
-      });
-      // correct version found
-      expect(nodeIds.indexOf('axis:axis@1.3')).toBeGreaterThanOrEqual(-1);
-      // non-compileOnly dependency is not found
-      expect(nodeIds.indexOf('com.android.tools.build:builder@2.3.0')).toBe(-1);
-      // no target file returned: see targetFileFilteredForCompatibility
-      expect(p.targetFile).toBeFalsy();
-      // TODO(kyegupov): when the project name issue is solved, change the assertion to:
-      // expect(p.targetFile, 'subproj' + dirSep + 'build.gradle', 'correct targetFile for the main depRoot');
-    }
-  }
-});
-
 test('multi-project-dependency-cycle: scanning the main project works fine', async () => {
   const result = await inspect(
     '.',
diff --git a/test/system/plugin.test.ts b/test/system/plugin.test.ts
index c59dada..33fd43f 100644
--- a/test/system/plugin.test.ts
+++ b/test/system/plugin.test.ts
@@ -74,7 +74,7 @@ test('multi-config: both compile and runtime deps picked up by default', async (
   const graphObject: any = JSON.parse(JSON.stringify(result.dependencyGraph));
   expect(graphObject.graph.nodes[0].deps.length).toBe(6);
 
-  expect(result.dependencyGraph.getPkgs().length).toBe(42);
+  expect(result.dependencyGraph.getPkgs().length).toBe(43);
 });
 
 test('multi-config: only deps for specified conf are picked up (precise match)', async () => {
@@ -126,7 +126,7 @@ test('multi-config: only deps for specified conf are picked up (fuzzy match)', a
   // double parsing to have access to internal depGraph data, no methods available to properly
   // return the deps nodeIds list that belongs to a node
   const graphObject: any = JSON.parse(JSON.stringify(result.dependencyGraph));
-  expect(graphObject.graph.nodes[0].deps.length).toBe(1);
+  expect(graphObject.graph.nodes[0].deps.length).toBe(5);
 });
 
 test('multi-config: only deps for specified conf are picked up (using legacy CLI argument)', async () => {
@@ -151,7 +151,7 @@ test('multi-config: only deps for specified conf are picked up (using legacy CLI
   // double parsing to have access to internal depGraph data, no methods available to properly
   // return the deps nodeIds list that belongs to a node
   const graphObject: any = JSON.parse(JSON.stringify(result.dependencyGraph));
-  expect(graphObject.graph.nodes[0].deps.length).toBe(1);
+  expect(graphObject.graph.nodes[0].deps.length).toBe(5);
 });
 
 test('custom dependency resolution via configurations.all is supported', async () => {