You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2016/03/15 08:53:51 UTC
[1/2] tapestry-5 git commit: upgrade Gradle wrapper
Repository: tapestry-5
Updated Branches:
refs/heads/master 0acf94ae0 -> e263e7df7
upgrade Gradle wrapper
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e263e7df
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e263e7df
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e263e7df
Branch: refs/heads/master
Commit: e263e7df7d41951dfb031cb89a153a815b7d3bc6
Parents: 6b912e2
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Tue Mar 15 08:53:21 2016 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Tue Mar 15 08:53:45 2016 +0100
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e263e7df/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 78762f4..66422fe 100755
--- a/build.gradle
+++ b/build.gradle
@@ -455,7 +455,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.11'
+ gradleVersion = '2.12'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e263e7df/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1aba6f..bd8068e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 11 11:40:38 CET 2016
+#Tue Mar 15 08:53:15 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
[2/2] tapestry-5 git commit: TAP5-2524: don't replace 0% with 0
during CSS minification because that breaks keyframes
Posted by jk...@apache.org.
TAP5-2524: don't replace 0% with 0 during CSS minification because that breaks keyframes
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6b912e26
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6b912e26
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6b912e26
Branch: refs/heads/master
Commit: 6b912e26896cd476e90b63b71da491ba6539d1f8
Parents: 0acf94a
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Tue Jan 5 15:33:06 2016 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Tue Mar 15 08:53:45 2016 +0100
----------------------------------------------------------------------
.../platform/yui/compressor/CssCompressor.java | 2 +-
.../webresources/tests/CssCompressorSpec.groovy | 29 ++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b912e26/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java b/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
index c5e2ec0..be124fc 100644
--- a/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
+++ b/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
@@ -325,7 +325,7 @@ public class CssCompressor {
css = css.replaceAll(";+}", "}");
// Replace 0(px,em,%) with 0.
- css = css.replaceAll("(?i)(^|[^0-9])(?:0?\\.)?0(?:px|em|%|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)", "$10");
+ css = css.replaceAll("(?i)(^|[^0-9])(?:0?\\.)?0(?:px|em|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)", "$10");
// Replace 0 0 0 0; with 0.
css = css.replaceAll(":0 0 0 0(;|})", ":0$1");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b912e26/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy b/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy
new file mode 100644
index 0000000..55ce38d
--- /dev/null
+++ b/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy
@@ -0,0 +1,29 @@
+package t5.webresources.tests
+
+import geb.spock.GebReportingSpec
+import org.apache.tapestry5.test.Jetty7Runner
+
+import com.yahoo.platform.yui.compressor.CssCompressor;
+
+import spock.lang.Issue;
+import spock.lang.Shared
+import spock.lang.Specification;
+
+class CssCompressorSpec extends Specification {
+
+ @Issue('TAP5-2524')
+ def "minify CSS with keyframes "() {
+ setup:
+ def css = '''@keyframes anim {
+ 0% { opacity: 0; }
+ 100% { opacity: 1; }
+}'''
+ StringWriter writer = new StringWriter()
+
+ when:
+ new CssCompressor(new StringReader(css)).compress(writer, -1)
+
+ then:
+ writer.toString() == '''@keyframes anim{0%{opacity:0}100%{opacity:1}}'''
+ }
+}
[2/2] tapestry-5 git commit: TAP5-2524: don't replace 0% with 0
during CSS minification because that breaks keyframes
Posted by jk...@apache.org.
TAP5-2524: don't replace 0% with 0 during CSS minification because that breaks keyframes
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6b912e26
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6b912e26
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6b912e26
Branch: refs/heads/master
Commit: 6b912e26896cd476e90b63b71da491ba6539d1f8
Parents: 0acf94a
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Tue Jan 5 15:33:06 2016 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Tue Mar 15 08:53:45 2016 +0100
----------------------------------------------------------------------
.../platform/yui/compressor/CssCompressor.java | 2 +-
.../webresources/tests/CssCompressorSpec.groovy | 29 ++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b912e26/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java b/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
index c5e2ec0..be124fc 100644
--- a/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
+++ b/tapestry-webresources/src/main/java/com/yahoo/platform/yui/compressor/CssCompressor.java
@@ -325,7 +325,7 @@ public class CssCompressor {
css = css.replaceAll(";+}", "}");
// Replace 0(px,em,%) with 0.
- css = css.replaceAll("(?i)(^|[^0-9])(?:0?\\.)?0(?:px|em|%|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)", "$10");
+ css = css.replaceAll("(?i)(^|[^0-9])(?:0?\\.)?0(?:px|em|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)", "$10");
// Replace 0 0 0 0; with 0.
css = css.replaceAll(":0 0 0 0(;|})", ":0$1");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b912e26/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy b/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy
new file mode 100644
index 0000000..55ce38d
--- /dev/null
+++ b/tapestry-webresources/src/test/groovy/t5/webresources/tests/CssCompressorSpec.groovy
@@ -0,0 +1,29 @@
+package t5.webresources.tests
+
+import geb.spock.GebReportingSpec
+import org.apache.tapestry5.test.Jetty7Runner
+
+import com.yahoo.platform.yui.compressor.CssCompressor;
+
+import spock.lang.Issue;
+import spock.lang.Shared
+import spock.lang.Specification;
+
+class CssCompressorSpec extends Specification {
+
+ @Issue('TAP5-2524')
+ def "minify CSS with keyframes "() {
+ setup:
+ def css = '''@keyframes anim {
+ 0% { opacity: 0; }
+ 100% { opacity: 1; }
+}'''
+ StringWriter writer = new StringWriter()
+
+ when:
+ new CssCompressor(new StringReader(css)).compress(writer, -1)
+
+ then:
+ writer.toString() == '''@keyframes anim{0%{opacity:0}100%{opacity:1}}'''
+ }
+}