Add NamedParam support for groovy-2.5 with backport to 2.4

internal-backport/src/main/java/groovy/transform/NamedParam.java

@@ -0,0 +1,41 @@
+/*
+ *  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.
+ */
+package groovy.transform;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+// Backport so that we can add it for 2.5 but can still build with 2.4 as well
+
+/**
+ * Marker interface used to indicate that the name of the annotated parameter
+ * (or specified optional name) is a valid key name when using named arguments
+ * and that the parameter type is applicable for type checking purposes.
+ *
+ * @since 2.5.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface NamedParam {
+  String value() default Undefined.STRING;
+  Class type() default Object.class;
+  boolean required() default false;
+}

internal-backport/src/main/java/groovy/transform/NamedParams.java

@@ -0,0 +1,37 @@
+/*
+ *  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.
+ */
+package groovy.transform;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+// Backport so that we can add it for 2.5 but can still build with 2.4 as well
+
+/**
+ * Collector annotation for {@link NamedParam}.
+ *
+ * @since 2.5.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface NamedParams {
+  NamedParam[] value();
+}

settings.gradle

@@ -7,6 +7,10 @@ include "spock-spring:spring2-test"
 include "spock-spring:spring3-test"
 include "spock-guice"
 
+if ((System.getProperty("variant") as BigDecimal ?: 2.4) == 2.4) {
+  include "internal-backport"
+}
+
 // https://issues.apache.org/jira/projects/TAP5/issues/TAP5-2588
 if (JavaVersion.current().isJava7() || JavaVersion.current().isJava8()) {
   include "spock-tapestry"

spock-core/core.gradle

@@ -20,6 +20,9 @@ dependencies {
   compile libs.bytebuddy, optional
   compile libs.cglib, optional
   compile libs.objenesis, optional
+  if (variant == 2.4) {
+    compileOnly project(':internal-backport')
+  }
 
   coreConsoleRuntime groovyConsoleExtraDependency
 }