Update gradle to 7.4.2

Author: stavshamir

.github/workflows/build-and-deploy.yml

@@ -27,7 +27,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Build
-        run: ./gradlew build -x signArchives
+        run: ./gradlew build
 
       - name: Publish package
         if: github.ref == 'refs/heads/master'

.github/workflows/build-on-pull-request.yml

@@ -19,4 +19,4 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Build
-        run: ./gradlew build -x signArchives
+        run: ./gradlew build

build.gradle

@@ -31,88 +31,55 @@ jar {
   metaInf { from 'dist/springwolf-ui' into 'resources/springwolf' }
 }
 
-task sourcesJar(type: Jar) {
-  classifier = 'sources'
-  from sourceSets.main.allSource
-}
-
-artifacts {
-  archives sourcesJar
-}
-
-signing {
-  sign configurations.archives
-
-  useInMemoryPgpKeys project.findProperty("SIGNINGKEY"), project.findProperty("SIGNINGPASSWORD")
-}
-
-def pomConfig = {
-  licenses {
-    license {
-      name 'The Apache License, Version 2.0'
-      url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    }
-  }
-
-  developers {
-    developer {
-      id 'stavshamir'
-      name 'Stav Shamir'
-      email 'shamir.stav@gmail.com'
-    }
-  }
-
-  scm {
-    url 'https://github.com/springwolf/springwolf-ui'
-  }
+java {
+  withSourcesJar()
 }
 
 publishing {
   publications {
     mavenJava(MavenPublication) {
-      artifact jar
-
-      artifact sourcesJar {
-        classifier "sources"
-      }
+      from components.java
 
-      groupId project.group
       artifactId 'springwolf-ui'
+      groupId project.group
       version project.version
-      pom.withXml {
-        def root = asNode()
-        root.appendNode('description', 'Web UI for Springwolf')
-        root.appendNode('name', 'springwolf-ui')
-        root.appendNode('url', 'https://github.com/springwolf/springwolf-ui')
-        root.children().last() + pomConfig
-
-        def pomFile = file("${project.buildDir}/generated-pom.xml")
-        writeTo(pomFile)
-
-        def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-        artifact(pomAscFile) {
-          classifier = null
-          extension = 'pom.asc'
+
+      pom {
+        name = 'springwolf-ui'
+        description = 'Web UI for Springwolf'
+        url = 'https://springwolf.github.io'
+
+        licenses {
+          license {
+            name = 'The Apache License, Version 2.0'
+            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+          }
         }
-      }
 
-      project.tasks.signArchives.signatureFiles.each {
-        artifact(it) {
-          def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-          if (matcher.find()) {
-            classifier = matcher.group(1)
-          } else {
-            classifier = null
+        developers {
+          developer {
+            id = 'stavshamir'
+            name = 'Stav Shamir'
+            email = 'shamir.stav@gmail.com'
+          }
+
+          developer {
+            id = 'timonback'
+            name = 'Timon Back'
+            email = 'timon.back+springwolf@gmail.com'
           }
-          extension = 'jar.asc'
+        }
+
+        scm {
+          url = 'https://github.com/springwolf/springwolf-ui'
         }
       }
     }
   }
 
   repositories {
     maven {
-      def releasesRepoUrl  = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+      def releasesRepoUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
       def snapshotsRepoUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
       url = isSnapshot ? snapshotsRepoUrl : releasesRepoUrl
       credentials {
@@ -121,13 +88,12 @@ publishing {
       }
     }
   }
+}
 
-  model {
-    tasks.publishMavenJavaPublicationToMavenLocal {
-      dependsOn project.tasks.signArchives
-    }
-    tasks.publishMavenJavaPublicationToMavenRepository {
-      dependsOn project.tasks.signArchives
-    }
-  }
+signing {
+  def signingKey = project.findProperty("SIGNINGKEY")
+  def signingPassword = project.findProperty("SIGNINGPASSWORD")
+  useInMemoryPgpKeys(signingKey, signingPassword)
+  sign publishing.publications.mavenJava
 }
+

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome