0005140: Upgrade to gradle version 7.4.2

JumpMind · May 25, 2022 · 42ea0f9 · 42ea0f9
1 parent b8d0f04
commit 42ea0f9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/symmetric-assemble/build.gradle b/symmetric-assemble/build.gradle
@@ -16,7 +16,7 @@ buildscript {
 
 plugins {
     id "org.sonarqube" version "3.3"
-	id "com.github.hierynomus.license" version "0.15.0"
+	id "com.github.hierynomus.license" version "0.16.1"
 	id 'com.vaadin' version '0.14.8.1' apply false
 }
 

diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle
@@ -91,7 +91,7 @@ subprojects { subproject ->
 
     configurations { deployerJars }
     configurations {
-    	testArtifacts.extendsFrom testRuntimeClasspath
+    	testArtifacts.extendsFrom testImplementation
     }
 
     configurations {

diff --git a/symmetric-assemble/gradle/wrapper/gradle-wrapper.properties b/symmetric-assemble/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/symmetric-core/build.gradle b/symmetric-core/build.gradle
@@ -38,4 +38,6 @@ apply from: symAssembleDir + '/common.gradle'
 
         testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
         testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
+        testImplementation project(':symmetric-jdbc').sourceSets.test.output
+        testImplementation project(':symmetric-jdbc').sourceSets.main.output
     }
diff --git a/symmetric-io/build.gradle b/symmetric-io/build.gradle
@@ -23,5 +23,7 @@ apply from: symAssembleDir + '/common.gradle'
         }
 
         testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
-        testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')        
+        testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
+        testImplementation project(':symmetric-jdbc').sourceSets.test.output
+        testImplementation project(':symmetric-jdbc').sourceSets.main.output
     }