Upgrade gradle and node (#28)

* Upgrade Gradle * Upgrade npm and node * Npm build improvements Co-authored-by: Ryan Horiguchi <[email protected]>
ContextMapper · Nov 4, 2022 · f5cc657 · f5cc657
1 parent 1380115
commit f5cc657
Show file tree

Hide file tree

Showing 7 changed files with 2,662 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Setup Node
       uses: dcodeIO/setup-node-nvm@master
       with:
-        node-version: 10.16
+        node-version: 18.12.0
     - name: Install Dependencies
       run: sudo apt-get -y install libsecret-1-dev
     - name: Gradle caches  

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup Node
       uses: dcodeIO/setup-node-nvm@master
       with:
-        node-version: 10.16
+        node-version: 18.12.0
     - name: Install Dependencies
       run: sudo apt-get -y install libsecret-1-dev
     - name: Gradle caches  

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
+        gradlePluginPortal()
     }
     dependencies {
         classpath "com.github.node-gradle:gradle-node-plugin:${gradleNodePluginVersion}"
@@ -41,8 +39,8 @@ task npmInstallVsce(type: NpmTask, dependsOn: npmSetup) {
 
 node {
     version = nodeVersion
-    npmVersion = npmVersion
     download = true
+    npmInstallCommand = 'ci'
 }
 
 def inputFiles = fileTree(
@@ -99,13 +97,6 @@ task clean {
 
 }
 
-plugins.withType(com.moowork.gradle.node.NodePlugin) {
-    node {
-        workDir = file("$rootProject.buildDir/nodejs")
-        nodeModulesDir = rootProject.projectDir
-    }
-}
-
 task copyLSPApplication(type: Copy) {
     from(tarTree(configurations.cmlLSPTar.files.iterator().next())) {
         eachFile { fcd ->

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,3 @@
 cmlVersion=6.6.2-SNAPSHOT
 gradleNodePluginVersion=2.2.4
-nodeVersion=10.16.0
-npmVersion=6.10.2
+nodeVersion=18.12.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Apr 17 11:33:56 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists