[1/3] groovy git commit: Avoid resolution of `codenarc` dependencies at configuration time

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/3] groovy git commit: Avoid resolution of `codenarc` dependencies at configuration time

cchampeau
Repository: groovy
Updated Branches:
  refs/heads/master 78918eb1d -> 31027cf07


Avoid resolution of `codenarc` dependencies at configuration time


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/93dad601
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/93dad601
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/93dad601

Branch: refs/heads/master
Commit: 93dad601ce57f05efb635d56008c1d0a5e76facb
Parents: 78918eb
Author: Cedric Champeau <[hidden email]>
Authored: Sun Dec 4 17:45:17 2016 +0100
Committer: Cedric Champeau <[hidden email]>
Committed: Sun Dec 4 17:45:56 2016 +0100

----------------------------------------------------------------------
 gradle/quality.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/93dad601/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index bc8e85e..d9ef353 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -60,7 +60,7 @@ allprojects {
                 project(':groovy-templates').sourceSets.main.output +
                 project(':groovy-xml').sourceSets.main.output +
                 configurations.compile +
-                files(configurations.codenarc.findAll { !(it.name =~ /groovy|junit/)})
+                files { configurations.codenarc.findAll { !(it.name =~ /groovy|junit/)} }
     }
 
     tasks.withType(Checkstyle) {

Reply | Threaded
Open this post in threaded view
|

[2/3] groovy git commit: Avoid resolution of `compile` dependencies at configuration time

cchampeau
Avoid resolution of `compile` dependencies at configuration time


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5338bfc9
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5338bfc9
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5338bfc9

Branch: refs/heads/master
Commit: 5338bfc9096e1500c907cc55a47eda8fa29164bd
Parents: 93dad60
Author: Cedric Champeau <[hidden email]>
Authored: Sun Dec 4 17:47:51 2016 +0100
Committer: Cedric Champeau <[hidden email]>
Committed: Sun Dec 4 17:47:51 2016 +0100

----------------------------------------------------------------------
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/5338bfc9/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6a649bf..2e3dbe3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -372,7 +372,7 @@ ext.modules = {
 task dgmConverter(dependsOn:compileJava) {
     description = 'Generates DGM info file required for faster startup.'
     def classesDir = sourceSets.main.output.classesDir
-    def classpath = files(classesDir, configurations.compile).asPath
+    def classpath = files(classesDir, configurations.compile)
 
     //main = 'org.codehaus.groovy.tools.DgmConverter'
     //args = ['--info', classesDir.absolutePath]
@@ -381,7 +381,7 @@ task dgmConverter(dependsOn:compileJava) {
         // we use ant.java because Gradle is a bit "too smart" with JavaExec
         // as it will invalidate the task if classpath changes, which will
         // happen once Groovy files are compiled
-        ant.java(classname:'org.codehaus.groovy.tools.DgmConverter', classpath: classpath) {
+        ant.java(classname:'org.codehaus.groovy.tools.DgmConverter', classpath: classpath.asPath) {
             arg(value: '--info')
             arg(value: classesDir.absolutePath)
         }

Reply | Threaded
Open this post in threaded view
|

[3/3] groovy git commit: Avoid resolution of `testClasspath` dependencies at configuration time

cchampeau
In reply to this post by cchampeau
Avoid resolution of `testClasspath` dependencies at configuration time


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/31027cf0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/31027cf0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/31027cf0

Branch: refs/heads/master
Commit: 31027cf07b7cbbb36a2deb7fe0b2620becf70e6c
Parents: 5338bfc
Author: Cedric Champeau <[hidden email]>
Authored: Sun Dec 4 17:54:13 2016 +0100
Committer: Cedric Champeau <[hidden email]>
Committed: Sun Dec 4 17:54:13 2016 +0100

----------------------------------------------------------------------
 subprojects/performance/build.gradle | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/31027cf0/subprojects/performance/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index e78e824..e8fde5e 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -71,13 +71,6 @@ task performanceTests {
         main = 'org.apache.groovy.perf.CompilerPerformanceTest'
         classpath = groovyConf + sourceSets.test.output + configurations.stats
         jvmArgs = ['-Xms512m', '-Xmx512m', '-XX:MaxPermSize=512m']
-        def compileClassPath = [
-                '-cp',
-                groovyConf.files[0]
-        ]
-        rootProject.sourceSets.test.compileClasspath.files
-                .findAll { it.name.endsWith('jar') && !it.name.contains('groovy') }
-                .collect(compileClassPath) { it.absolutePath }
 
         // configure some files to compile. This is an arbitrary set of files which can be compiled
         // independently of the version of Groovy being tested
@@ -99,10 +92,20 @@ task performanceTests {
             "../../benchmark/bench/${it}.groovy"
         }
 
-        args = [
-                *testFiles,
-                *compileClassPath
-        ]
+        doFirst {
+            def compileClassPath = [
+                    '-cp',
+                    groovyConf.files[0]
+            ]
+            rootProject.sourceSets.test.compileClasspath.files
+                    .findAll { it.name.endsWith('jar') && !it.name.contains('groovy') }
+                    .collect(compileClassPath) { it.absolutePath }
+
+            args = [
+                    *testFiles,
+                    *compileClassPath
+            ]
+        }
 
     }
     performanceTests.dependsOn(t)