From 78835f875becbc9e43a358103a831320a5c7fdf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Tue, 21 Dec 2021 22:15:20 +0100
Subject: [PATCH] update to gradle 7.3.2

---
 gradle.properties                        |  2 +-
 gradle/compile/java.gradle               |  2 ++
 gradle/documentation/asciidoc.gradle     | 36 ------------------------
 gradle/ide/idea.gradle                   |  5 ----
 gradle/test/junit5.gradle                |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e7bb766..59d1105 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ name = datastructures
 version = 1.0.0
 
 org.gradle.warning.mode = ALL
-gradle.wrapper.version = 7.3
+gradle.wrapper.version = 7.3.2
 mockito.version = 3.12.4
 jxl.version = 2.6.12
 gson.version = 2.8.9
diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle
index d3f286e..7b7c7e7 100644
--- a/gradle/compile/java.gradle
+++ b/gradle/compile/java.gradle
@@ -22,11 +22,13 @@ jar {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
+    dependsOn classes
     classifier 'sources'
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
+    dependsOn javadoc
     classifier 'javadoc'
     from javadoc.destinationDir
 }
diff --git a/gradle/documentation/asciidoc.gradle b/gradle/documentation/asciidoc.gradle
index 87ba22e..da6dd7e 100644
--- a/gradle/documentation/asciidoc.gradle
+++ b/gradle/documentation/asciidoc.gradle
@@ -1,14 +1,5 @@
 apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 
-configurations {
-    asciidoclet
-}
-
-dependencies {
-    asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
-}
-
-
 asciidoctor {
     backends 'html5'
     outputDir = file("${rootProject.projectDir}/docs")
@@ -26,30 +17,3 @@ asciidoctor {
             imagesdir: 'img',
             stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
 }
-
-
-/*javadoc {
-options.docletpath = configurations.asciidoclet.files.asType(List)
-options.doclet = 'org.asciidoctor.Asciidoclet'
-//options.overview = "src/docs/asciidoclet/overview.adoc"
-options.addStringOption "-base-dir", "${projectDir}"
-options.addStringOption "-attribute",
-        "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
-configure(options) {
-    noTimestamp = true
-}
-}*/
-
-
-/*javadoc {
-    options.docletpath = configurations.asciidoclet.files.asType(List)
-    options.doclet = 'org.asciidoctor.Asciidoclet'
-    options.overview = "${rootProject.projectDir}/src/docs/asciidoclet/overview.adoc"
-    options.addStringOption "-base-dir", "${projectDir}"
-    options.addStringOption "-attribute",
-            "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
-    options.destinationDirectory(file("${projectDir}/docs/javadoc"))
-    configure(options) {
-        noTimestamp = true
-    }
-}*/
diff --git a/gradle/ide/idea.gradle b/gradle/ide/idea.gradle
index 64e2167..5bd2095 100644
--- a/gradle/ide/idea.gradle
+++ b/gradle/ide/idea.gradle
@@ -6,8 +6,3 @@ idea {
         testOutputDir file('build/classes/java/test')
     }
 }
-
-if (project.convention.findPlugin(JavaPluginConvention)) {
-    //sourceSets.main.output.classesDirs = file("build/classes/java/main")
-    //sourceSets.test.output.classesDirs = file("build/classes/java/test")
-}
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
index 42eb862..913d9c7 100644
--- a/gradle/test/junit5.gradle
+++ b/gradle/test/junit5.gradle
@@ -1,5 +1,5 @@
 
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.1'
+def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.2'
 def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
 
 dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fbce071..ac0b842 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists