Skip to content
Browse files

build tweaks - primarily to fix javadoc/groovydoc warnings/glitches

  • Loading branch information...
1 parent a71e72a commit 35d3a6dfd4727c549c9bc35a9ed53bf689ed9fe3 @paulk-asert paulk-asert committed May 28, 2012
View
2 build.gradle
@@ -12,8 +12,6 @@ allprojects {
group = 'org.codehaus.groovy'
version = groovyVersion
-// tasks.withType(Checkstyle).all { t -> t.ignoreFailures = true }
-// tasks.withType(CodeNarc).all { t -> t.ignoreFailures = true }
repositories {
mavenCentral()
}
View
11 gradle/assemble.gradle
@@ -216,14 +216,13 @@ task sourceAllJar(type: Jar, dependsOn: { modules()*.sourceJar }) {
//with sourceJar.rootSpec
}
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = rootProject.useIndy()?'indy-javadoc':'javadoc'
- from javadoc.destinationDir
-}
-
allprojects {
+ task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = rootProject.useIndy()?'indy-javadoc':'javadoc'
+ from javadoc.destinationDir
+ }
task groovydocJar(type: Jar, dependsOn: groovydoc) {
- classifier = 'groovydoc'
+ classifier = rootProject.useIndy()?'indy-groovydoc':'groovydoc'
from groovydoc.destinationDir
}
}
View
2 settings.gradle
@@ -7,3 +7,5 @@ include 'groovy-ant', 'groovy-bsf', 'groovy-console', 'groovy-docgenerator',
rootProject.children.each { prj ->
prj.projectDir = new File("$rootDir/subprojects/$prj.name")
}
+
+rootProject.name = 'groovy' // TODO should this be groovy-core?
View
7 src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -970,9 +970,10 @@ Person foo(B i){...}
/**
* Given a receiver and a method node, parameterize the method arguments using
* available generic type information.
- * @param receiver
- * @param m
- * @return
+ *
+ * @param receiver the class
+ * @param m the method
+ * @return the parameterized arguments
*/
public static Parameter[] parameterizeArguments(final ClassNode receiver, final MethodNode m) {
MethodNode mn = m;
View
2 subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
@@ -43,7 +43,7 @@
* So it is replaced by a 2-step approach inspired from json2.js sources:
* https://github.com/douglascrockford/JSON-js/blob/master/json2.js#L462
*
- * See {@link JsonTokenTypeTest#testMatchingLongStringWithBackslashes()} for details.
+ * See JsonTokenTypeTest#testMatchingLongStringWithBackslashes() for details.
*/
STRING ( "a string", new Closure(null) {
private Pattern replacePattern = Pattern.compile("(?:\\\\[\"\\\\bfnrt\\/]|\\\\u[0-9a-fA-F]{4})");
View
92 ...n/groovy/transform/NotYetImplemented.java → ...a/groovy/transform/NotYetImplemented.java
@@ -1,46 +1,46 @@
-/*
- * Copyright 2003-2012 the original author or authors.
- *
- * Licensed 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 org.codehaus.groovy.transform.GroovyASTTransformationClass;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Method annotation used to invert test case results. If a JUnit 3/4 test case method is
- * annotated with {@code @NotYetImplemented} the test will fail if no test failure occurs and it will pass
- * if a test failure occurs.<p/>
- *
- * This is helpful for tests that don't currently work but should work one day,
- * when the tested functionality has been implemented.<p/>
- *
- * The idea for this AST transformation originated in {@link groovy.util.GroovyTestCase#notYetImplemented()}.
- *
- * @author Dierk König
- * @author Andre Steingress
- * @author Ilinca V. Hallberg
- * @author Björn Westlin
- * @since 2.0.0
- */
-@java.lang.annotation.Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-@GroovyASTTransformationClass("org.codehaus.groovy.transform.NotYetImplementedASTTransformation")
-public @interface NotYetImplemented {
-}
+/*
+ * Copyright 2003-2012 the original author or authors.
+ *
+ * Licensed 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 org.codehaus.groovy.transform.GroovyASTTransformationClass;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Method annotation used to invert test case results. If a JUnit 3/4 test case method is
+ * annotated with {@code @NotYetImplemented} the test will fail if no test failure occurs and it will pass
+ * if a test failure occurs.<p/>
+ *
+ * This is helpful for tests that don't currently work but should work one day,
+ * when the tested functionality has been implemented.<p/>
+ *
+ * The idea for this AST transformation originated in {@link groovy.util.GroovyTestCase#notYetImplemented()}.
+ *
+ * @author Dierk König
+ * @author Andre Steingress
+ * @author Ilinca V. Hallberg
+ * @author Björn Westlin
+ * @since 2.0.0
+ */
+@java.lang.annotation.Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@GroovyASTTransformationClass("org.codehaus.groovy.transform.NotYetImplementedASTTransformation")
+public @interface NotYetImplemented {
+}
View
1 ...-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
@@ -15,7 +15,6 @@
*/
package org.codehaus.groovy.transform;
-import junit.framework.AssertionFailedError;
import org.codehaus.groovy.ast.*;
import org.codehaus.groovy.ast.expr.ArgumentListExpression;
import org.codehaus.groovy.ast.expr.ConstantExpression;

0 comments on commit 35d3a6d

Please sign in to comment.
Something went wrong with that request. Please try again.