Merge branch 'master' into dependency-catalog

# Conflicts: # build.gradle.kts # plugin/build.gradle.kts
metaborg · Jul 24, 2024 · 2c2d9e7 · 2c2d9e7
2 parents 6958626 + d2e5c16
commit 2c2d9e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 #!groovy
-@Library('metaborg.jenkins.pipeline@develop') _
+@Library('metaborg.jenkins.pipeline') _
 
 gradlePipeline(
   buildOtherBranch: false,

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 # These properties are only used when this repository is built stand-alone, outside of devenv.
 org.gradle.jvmargs=-Xms512M -Xmx2G -Xss8M
-systemProp.spoofax2Version=2.5.20
+systemProp.spoofax2Version=2.5.21