From 43aec7e8ea9aa4f68c45ebe0039d64ee9dcebec4 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 8 Jun 2022 00:46:29 -0500 Subject: [PATCH] Revert "HHH-15314 - Hibernate Gradle plugin is not working for Kotlin projects" This reverts commit f2613913729a99e8c41bcfedc694559579f7b370. --- .../orm/tooling/gradle/enhance/EnhancementTask.java | 8 ++------ .../orm/tooling/gradle/HibernateOrmPluginTest.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java index af06ccce4b..4d05bea375 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java @@ -33,12 +33,6 @@ import static org.hibernate.orm.tooling.gradle.HibernateOrmSpec.HIBERNATE; public class EnhancementTask extends DefaultTask { public static final String DSL_NAME = "hibernateEnhance"; - private final DirectoryProperty compilationOutputDirectory; - private final DirectoryProperty outputDirectory; - - public EnhancementTask() { - } - public static void apply(HibernateOrmSpec pluginDsl, SourceSet mainSourceSet, Project project) { final EnhancementTask enhancementTask = project.getTasks().create( DSL_NAME, @@ -58,6 +52,8 @@ public class EnhancementTask extends DefaultTask { } private final EnhancementSpec enhancementDsl; + private final DirectoryProperty javaCompileOutputDirectory; + private final DirectoryProperty outputDirectory; @Inject public EnhancementTask(HibernateOrmSpec pluginDsl, SourceSet mainSourceSet, Project project) { diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java index 10bc31cb09..7a00ef4a11 100644 --- a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java +++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java @@ -126,7 +126,7 @@ class HibernateOrmPluginTest { } @Test - @Disabled( "up-to-date checking not working" ) +// @Disabled( "up-to-date checking not working" ) public void testJpaMetamodelGenUpToDate(@TempDir Path projectDir) { Copier.copyProject( "simple/build.gradle", projectDir );