Merge pull request #33 from bouvet-apps/release/3.2.0

Release/3.2.0

.babelrc

@@ -4,7 +4,7 @@
   ],
   "comments": true,
   "plugins": [
-    "@babel/plugin-proposal-nullish-coalescing-operator",
-    "@babel/plugin-proposal-optional-chaining"
+    "@babel/plugin-transform-nullish-coalescing-operator",
+    "@babel/plugin-transform-optional-chaining"
   ]
 }

build.gradle

@@ -1,10 +1,10 @@
 plugins {
     id 'java'
     id 'maven-publish'
-    id 'com.enonic.xp.app' version '3.2.0'
-    id "com.github.node-gradle.node" version "3.4.0"
+    id 'com.enonic.xp.app' version '3.4.0'
+    id "com.github.node-gradle.node" version "7.0.0"
     id 'org.ajoberstar.grgit' version '4.1.1'
-    id "com.github.ben-manes.versions" version '0.42.0'
+    id "com.github.ben-manes.versions" version '0.47.0'
 }
 
 sourceCompatibility = "1.11"
@@ -39,6 +39,10 @@ sourceSets {
     }
 }
 
+tasks.named("jar") {
+    dependsOn(":npmBuild")
+}
+
 task copyDist {
   dependsOn(':deploy')
   group 'application'
@@ -86,7 +90,8 @@ task npmBuild(type: NpmTask,
     outputs.dir "$buildDir/resources/main"
 }
 
-jar.dependsOn npmBuild
+rootProject.tasks.getByName('build').dependsOn npmBuild
+
 build.finalizedBy(copyDist)
 
 clean.dependsOn(cleanDist)
@@ -100,9 +105,9 @@ dependencies {
     include "com.enonic.xp:lib-i18n:${xpVersion}"
     include "com.enonic.xp:lib-portal:${xpVersion}"
     include "com.enonic.xp:lib-websocket:${xpVersion}"
-    include 'com.enonic.lib:lib-cache:2.1.1'
-    include 'com.enonic.lib:lib-http-client:3.2.0'
-    include "com.enonic.lib:lib-thymeleaf:2.0.1"
+    include 'com.enonic.lib:lib-cache:2.2.0'
+    include 'com.enonic.lib:lib-http-client:3.2.2'
+    include "com.enonic.lib:lib-thymeleaf:2.1.0"
 }
 
 repositories {
@@ -115,15 +120,15 @@ repositories {
 
 node {
     // Version of node to use.
-    version = '16.14.2'
+    version = '16.20.2'
     // Version of npm to use.
-    npmVersion = '8.5.0'
+    npmVersion = '8.19.4'
     // If true, it will download node using above parameters.
     // If false, it will try to use globally installed node.
     download = true
 }
 
 wrapper {
-    gradleVersion = '7.3.1'
+    gradleVersion = '8.3'
     distributionType = Wrapper.DistributionType.BIN
 }

gradle.properties

@@ -7,5 +7,5 @@ appName = no.bouvet.app.linkchecker
 displayName = LinkChecker
 vendorName = Bouvet Norge AS
 vendorUrl = https://www.bouvet.no
-xpVersion = 7.9.0
-version = 3.1.0
+xpVersion = 7.9.2
+version = 3.2.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists