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 2018/03/31 23:36:37 UTC
groovy git commit: remove an unused build file and add two $$bridge
methods for binary compatibility
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 5db4b4970 -> 5f5a8ba6b
remove an unused build file and add two $$bridge methods for binary compatibility
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5f5a8ba6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5f5a8ba6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5f5a8ba6
Branch: refs/heads/GROOVY_2_5_X
Commit: 5f5a8ba6b7503724a3d50571c89cfd578b4f7014
Parents: 5db4b49
Author: Paul King <pa...@asert.com.au>
Authored: Sun Apr 1 09:36:28 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sun Apr 1 09:36:28 2018 +1000
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/utils.gradle | 40 --------------------
.../groovy/runtime/StringGroovyMethods.java | 12 ++++++
3 files changed, 13 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/5f5a8ba6/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0bd43fb..ba4ca60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -324,6 +324,7 @@ compileJava {
doLast {
ant.java(classname:'org.jboss.bridger.Bridger', classpath: rootProject.configurations.tools.asPath, outputproperty: 'stdout') {
arg(value: "${sourceSets.main.java.outputDir.canonicalPath}/org/codehaus/groovy/runtime/DefaultGroovyMethods.class")
+ arg(value: "${sourceSets.main.java.outputDir.canonicalPath}/org/codehaus/groovy/runtime/StringGroovyMethods.class")
}
ant.echo('Bridger: ' + ant.properties.stdout)
}
@@ -358,7 +359,6 @@ task ensureGrammars {
}
}
-apply from: 'gradle/utils.gradle'
apply from: 'wrapper.gradle'
task dgmConverter(dependsOn:compileJava) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/5f5a8ba6/gradle/utils.gradle
----------------------------------------------------------------------
diff --git a/gradle/utils.gradle b/gradle/utils.gradle
deleted file mode 100644
index 6baf1c9..0000000
--- a/gradle/utils.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.objectweb.asm.MethodVisitor
-import org.objectweb.asm.ClassWriter
-import org.objectweb.asm.Label
-
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC
-import static org.objectweb.asm.Opcodes.ACC_STATIC
-import static org.objectweb.asm.Opcodes.ACC_SUPER
-import static org.objectweb.asm.Opcodes.ALOAD
-import static org.objectweb.asm.Opcodes.ATHROW
-import static org.objectweb.asm.Opcodes.INVOKESPECIAL
-import static org.objectweb.asm.Opcodes.RETURN
-import static org.objectweb.asm.Opcodes.V1_5
-
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath "org.ow2.asm:asm:$asmVersion"
- }
-}
http://git-wip-us.apache.org/repos/asf/groovy/blob/5f5a8ba6/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index 0ae574c..35d9ab6 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -547,6 +547,12 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
return join(DefaultGroovyMethods.dropWhile(selfIter, condition), "");
}
+ // for binary compatibility only
+ @Deprecated
+ public static CharSequence dropWhile$$bridge(CharSequence self, @ClosureParams(value=FromString.class, conflictResolutionStrategy=PickFirstResolver.class, options={"String", "Character"}) Closure condition) {
+ return dropWhile(self, condition);
+ }
+
/**
* A GString variant of the equivalent CharSequence method.
*
@@ -3344,6 +3350,12 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
return join(DefaultGroovyMethods.takeWhile(selfIter, condition), "");
}
+ // for binary compatibility only
+ @Deprecated
+ public static CharSequence takeWhile$$bridge(CharSequence self, @ClosureParams(value=FromString.class, conflictResolutionStrategy=PickFirstResolver.class, options={"String", "Character"}) Closure condition) {
+ return takeWhile(self, condition);
+ }
+
/**
* A GString variant of the equivalent GString method.
*