You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/08/24 06:32:26 UTC

[groovy] 01/02: update performance for Groovy 4

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 2aff212f7f481c07d29e7833b8be714e63c2774e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Aug 9 10:14:59 2022 +1000

    update performance for Groovy 4
---
 .../org/apache/groovy/gradle/PerformanceTestsExtension.groovy |  4 ++--
 subprojects/performance/build.gradle                          | 11 ++++-------
 versions.properties                                           |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
index 3f3d53fdb2..8c69af340e 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
@@ -83,12 +83,12 @@ class PerformanceTestsExtension {
                 it.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
                 it.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
             }
-            it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':']) : "org.codehaus.groovy:groovy:$v"))
+            it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':']) : (v.startsWith('4') ? "org.apache.groovy:groovy:$v" : "org.codehaus.groovy:groovy:$v")))
         }
         def outputFile = layout.buildDirectory.file("compilation-stats-${version}.csv")
         def perfTest = tasks.register("performanceTestGroovy${version}", JavaExec) {
             it.group = "Performance tests"
-            it.main = 'org.apache.groovy.perf.CompilerPerformanceTest'
+            it.mainClass.set('org.apache.groovy.perf.CompilerPerformanceTest')
             it.classpath(groovyConf, sourceSets.getByName('test').output)
             it.jvmArgs = ['-Xms512m', '-Xmx512m', '-XX:MaxPermSize=512m']
             it.outputs.file(outputFile)
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index 8a26b4ede3..06d63c54bb 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -21,13 +21,10 @@ plugins {
 }
 
 performanceTests {
-    versions '1.8.9',
-            '2.0.8',
-            '2.1.9',
-            '2.2.2',
-            '2.3.10',
-            '2.3.11',
-            '2.4.7',
+    versions '2.4.21',
+            '2.5.18',
+            '3.0.12',
+            '4.0.4',
             'current'
 
     testFiles project.files("src/files") +
diff --git a/versions.properties b/versions.properties
index 6db7578011..d55154136f 100644
--- a/versions.properties
+++ b/versions.properties
@@ -33,7 +33,7 @@ jackson=2.13.3
 jarjar=1.8.1
 javaParser=3.24.4
 jline=2.14.6
-jmh=1.27
+jmh=1.35
 jmock=1.2.0
 jruby=9.2.17.0
 logback=1.2.11