diff --git a/rewrite-groovy2-test/build.gradle.kts b/rewrite-groovy2-test/build.gradle.kts new file mode 100644 index 00000000000..de35399ace8 --- /dev/null +++ b/rewrite-groovy2-test/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("org.openrewrite.build.language-library") +} + +dependencies { + testImplementation(project(":rewrite-groovy")) + testImplementation(project(":rewrite-test")) + testImplementation("org.junit.jupiter:junit-jupiter:latest.release") + testImplementation("org.codehaus.groovy:groovy:[2.5,2.6)") + testRuntimeOnly("org.codehaus.groovy:groovy-all:[2.5,2.6)") + testRuntimeOnly(project(":rewrite-java-8")) +} + +tasks.named("compileTestJava") { + sourceCompatibility = JavaVersion.VERSION_1_8.toString() + targetCompatibility = JavaVersion.VERSION_1_8.toString() + + options.release.set(null as Int?) // remove `--release 8` set in `org.openrewrite.java-base` +} diff --git a/rewrite-groovy2-test/src/test/java/org/openrewrite/groovy/.editorconfig b/rewrite-groovy2-test/src/test/java/org/openrewrite/groovy/.editorconfig new file mode 100644 index 00000000000..a4824935e4f --- /dev/null +++ b/rewrite-groovy2-test/src/test/java/org/openrewrite/groovy/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*.java] +indent_size = 4 +ij_continuation_indent_size = 2 diff --git a/rewrite-groovy2-test/src/test/java/org/openrewrite/groovy/Groovy2Test.java b/rewrite-groovy2-test/src/test/java/org/openrewrite/groovy/Groovy2Test.java new file mode 100644 index 00000000000..1bd0eaa8fdf --- /dev/null +++ b/rewrite-groovy2-test/src/test/java/org/openrewrite/groovy/Groovy2Test.java @@ -0,0 +1,39 @@ +/* + * Copyright 2024 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 + *

+ * https://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 org.openrewrite.groovy; + +import org.junit.jupiter.api.Test; +import org.openrewrite.test.RewriteTest; + +import static org.openrewrite.groovy.Assertions.groovy; + +class Groovy2Test implements RewriteTest { + + @Test + void useInt() { + rewriteRun(groovy("def variable = \"12345\"")); + } + + @Test + void useJavaUtilDate() { + rewriteRun(groovy("def variable = new java.util.Date()")); + } + + @Test + void useStringMultiplicationInParentheses() { + rewriteRun(groovy("def variable = (\"#\" * 6)")); + } +} diff --git a/rewrite-java-test/build.gradle.kts b/rewrite-java-test/build.gradle.kts index 126a398663e..13f24aa76d6 100644 --- a/rewrite-java-test/build.gradle.kts +++ b/rewrite-java-test/build.gradle.kts @@ -11,9 +11,6 @@ dependencies { testImplementation("io.github.classgraph:classgraph:latest.release") testImplementation("org.junit-pioneer:junit-pioneer:2.0.0") testRuntimeOnly(project(":rewrite-java-17")) - testRuntimeOnly("junit:junit:4.13.2") { - because("Used for RemoveUnneededAssertionTest") - } testRuntimeOnly("org.apache.hbase:hbase-shaded-client:2.4.11") testRuntimeOnly("com.google.guava:guava:latest.release") testRuntimeOnly("org.mapstruct:mapstruct:latest.release") diff --git a/settings.gradle.kts b/settings.gradle.kts index 49af5568e86..eb3ae093d6e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,24 +10,27 @@ pluginManagement { // --------------------------------------------------------------- val allProjects = listOf( - "rewrite-benchmarks", - "rewrite-bom", - "rewrite-core", - "rewrite-gradle", - "rewrite-groovy", - "rewrite-hcl", - "rewrite-java", - "rewrite-java-tck", - "rewrite-java-test", - "rewrite-java-17", // remove this when rewrite recipe gradle plugin moves to 21 - "rewrite-java-21", - "rewrite-json", - "rewrite-maven", - "rewrite-properties", - "rewrite-protobuf", - "rewrite-test", - "rewrite-xml", - "rewrite-yaml", + "rewrite-benchmarks", + "rewrite-bom", + "rewrite-core", + "rewrite-gradle", + "rewrite-groovy", + "rewrite-groovy2-test", + "rewrite-hcl", + "rewrite-java", + "rewrite-java-tck", + "rewrite-java-test", + "rewrite-java-8", + "rewrite-java-11", + "rewrite-java-17", // remove this when rewrite recipe gradle plugin moves to 21 + "rewrite-java-21", + "rewrite-json", + "rewrite-maven", + "rewrite-properties", + "rewrite-protobuf", + "rewrite-test", + "rewrite-xml", + "rewrite-yaml", ) val includedProjects = file("IDE.properties").let { @@ -42,7 +45,7 @@ val includedProjects = file("IDE.properties").let { } }.toSet() -if(!file("IDE.properties").exists() || includedProjects.contains("tools")) { +if (!file("IDE.properties").exists() || includedProjects.contains("tools")) { includeBuild("tools") } @@ -52,23 +55,23 @@ gradle.allprojects { configurations.all { resolutionStrategy.dependencySubstitution { allProjects - .minus(includedProjects) - .minus(arrayOf("rewrite-bom")) - .forEach { - substitute(project(":$it")) - .using(module("org.openrewrite:$it:latest.integration")) - } + .minus(includedProjects) + .minus(arrayOf("rewrite-bom")) + .forEach { + substitute(project(":$it")) + .using(module("org.openrewrite:$it:latest.integration")) + } } } } if (System.getProperty("idea.active") == null && - System.getProperty("idea.sync.active") == null) { + System.getProperty("idea.sync.active") == null) { include( - "rewrite-java-8", - "rewrite-java-11", - "rewrite-java-17", - "rewrite-java-21" + "rewrite-java-8", + "rewrite-java-11", + "rewrite-java-17", + "rewrite-java-21" ) }