Merge pull request quarkusio#10906 from glefloch/fix/10631

geoand · Jul 23, 2020 · 100bc39 · 100bc39
2 parents 89b900f + 412bd4f
commit 100bc39
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 30 deletions.
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
@@ -138,9 +138,7 @@ public void execute(Task test) {
 
                     Task classesTask = tasks.getByName(JavaPlugin.CLASSES_TASK_NAME);
                     Task resourcesTask = tasks.getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME);
-                    // TODO quarkusDev needs to depend on quarkusPrepare for code gen reload #10631
-                    // TODO but it causes strange failures on other gradle tests
-                    quarkusDev.dependsOn(classesTask, resourcesTask);
+                    quarkusDev.dependsOn(classesTask, resourcesTask, quarkusPrepare);
                     quarkusRemoteDev.dependsOn(classesTask, resourcesTask);
                     quarkusBuild.dependsOn(classesTask, resourcesTask, tasks.getByName(JavaPlugin.JAR_TASK_NAME));
 

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java
@@ -44,7 +44,6 @@ public void prepareQuarkus() {
         appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(getProject()));
 
         final AppModelResolver modelResolver = extension().getAppModelResolver();
-
         final Properties realProperties = getBuildSystemProperties(appArtifact);
 
         Path buildDir = getProject().getBuildDir().toPath();

diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java
@@ -1,24 +1,24 @@
-//package io.quarkus.gradle.devmode;
-//
-//import static org.assertj.core.api.Assertions.assertThat;
-//
-//import com.google.common.collect.ImmutableMap;
-// // TODO: to be uncommented with #10631
-//public class GrpcDevModeTest extends QuarkusDevGradleTestBase {
-//    @Override
-//    protected String projectDirectoryName() {
-//        return "grpc-multi-module-project";
-//    }
-//
-//    @Override
-//    protected void testDevMode() throws Exception {
-//        assertThat(getHttpResponse("/hello")).isEqualTo("hello 2");
-//
-//        replace("application/src/main/proto/devmodetest.proto",
-//                ImmutableMap.of("TEST_ONE = 2;", "TEST_ONE = 15;"));
-//
-//        Thread.sleep(1000);
-//
-//        assertThat(getHttpResponse("/hello")).isEqualTo("hello 15");
-//    }
-//}
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+
+public class GrpcDevModeTest extends QuarkusDevGradleTestBase {
+    @Override
+    protected String projectDirectoryName() {
+        return "grpc-multi-module-project";
+    }
+
+    @Override
+    protected void testDevMode() throws Exception {
+        assertThat(getHttpResponse("/hello")).isEqualTo("hello 2");
+
+        replace("application/src/main/proto/devmodetest.proto",
+                ImmutableMap.of("TEST_ONE = 2;", "TEST_ONE = 15;"));
+
+        Thread.sleep(1000);
+
+        assertThat(getHttpResponse("/hello")).isEqualTo("hello 15");
+    }
+}
diff --git a/...on-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle b/...on-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle
@@ -19,11 +19,11 @@ test {
     forkEvery 1
 }
 
-quarkusDev {
+quarkusPrepare {
     dependsOn 'publishAcmeExt'
 }
 
 task publishAcmeExt {
     dependsOn ':runtime:publishToMavenLocal'
     dependsOn ':deployment:publishToMavenLocal'
-}
+}