Also remvoe other asm jars like asm-util this fixes #28

Bump version number
beckje01 · Jun 30, 2014 · f6cfed8 · f6cfed8
1 parent 6dbd289
commit f6cfed8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CodeCoverageGrailsPlugin.groovy b/CodeCoverageGrailsPlugin.groovy
@@ -1,5 +1,5 @@
 class CodeCoverageGrailsPlugin {
-	def version = '2.0.3-1'
+	def version = '2.0.3-2-SNAPSHOT'
 
 	def grailsVersion = '1.3 > *'
 

diff --git a/scripts/_Events.groovy b/scripts/_Events.groovy
@@ -224,7 +224,7 @@ def flushReportData() {
         event("StatusError", ["""
 --------------------------------------------
 ***********WARNING*************
-Unable to flush code coverage data.  
+Unable to flush code coverage data.
 This usually happens when tests don't actually test anything;
 e.g. none of the instrumented classes were exercised by tests!
 --------------------------------------------
@@ -239,7 +239,7 @@ String createCoverageClasspath() {
     String pathSeparator = System.getProperty('path.separator')
     String fileSeparator = System.getProperty('file.separator')
     String separator = "\\${fileSeparator}"
-    String pattern = "^.*?${separator}asm${separator}asm${separator}3\\..*?${separator}asm-3\\..*?\\.jar\$"
+    String pattern = "^.*?${separator}asm${separator}asm-?.*${separator}3\\..*?${separator}asm-?.*-3\\..*?\\.jar\$"
 
     List<String> classpathEntries = []
 
@@ -248,9 +248,9 @@ String createCoverageClasspath() {
     }
 
     grailsTestClasspath.toString().split(pathSeparator).each { String classpathEntry ->
-        if (classpathEntry =~ pattern) {
-            println """INFO: Found ASM 3: ${classpathEntry}. 
-      Possibly because grails-core (grails-plugin-databinding) uses it. 
+        if (classpathEntry ==~ pattern) {
+            println """INFO: Found ASM 3: ${classpathEntry}.
+      Possibly because grails-core (grails-plugin-databinding) uses it.
       Removing from instrumentation classpath!"""
         } else {
             classpathEntries << classpathEntry