fix localdev config

tschuehly · Aug 17, 2023 · e8f0b49 · e8f0b49
1 parent a7b7326
commit e8f0b49
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/.../src/main/kotlin/de/tschuehly/spring/viewcomponent/core/ViewComponentAutoConfiguration.kt b/.../src/main/kotlin/de/tschuehly/spring/viewcomponent/core/ViewComponentAutoConfiguration.kt
@@ -24,24 +24,24 @@ class ViewComponentAutoConfiguration(
     @Configuration
     @ConditionalOnProperty("spring.view-component.local-development")
     class LocalDevConfig(
+        private val fileSystemWatcher: FileSystemWatcher
     ) {
         @PostConstruct
-        fun startWatcher(fileSystemWatcher: FileSystemWatcher) {
+        fun startWatcher() {
             fileSystemWatcher.start()
         }
-        @Bean
-        fun viewComponentFileSystemWatcher(applicationContext: ApplicationContext): FileSystemWatcher {
-            val fileSystemWatcher = FileSystemWatcher(true, Duration.ofMillis(500), Duration.ofMillis(300))
-            if (File("src/main/kotlin").isDirectory) {
-                fileSystemWatcher.addSourceDirectory(File("src/main/kotlin/"))
-            }
-            if (File("src/main/java").isDirectory) {
-                fileSystemWatcher.addSourceDirectory(File("src/main/java/"))
-            }
-            fileSystemWatcher.addListener(ViewComponentChangeListener(applicationContext))
-            return fileSystemWatcher
+    }
+    @Bean
+    @ConditionalOnProperty("spring.view-component.local-development")
+    fun viewComponentFileSystemWatcher(applicationContext: ApplicationContext): FileSystemWatcher {
+        val fileSystemWatcher = FileSystemWatcher(true, Duration.ofMillis(500), Duration.ofMillis(300))
+        if (File("src/main/kotlin").isDirectory) {
+            fileSystemWatcher.addSourceDirectory(File("src/main/kotlin/"))
         }
-
-
+        if (File("src/main/java").isDirectory) {
+            fileSystemWatcher.addSourceDirectory(File("src/main/java/"))
+        }
+        fileSystemWatcher.addListener(ViewComponentChangeListener(applicationContext))
+        return fileSystemWatcher
     }
 }
diff --git a/examples/thymeleaf-example/settings.gradle.kts b/examples/thymeleaf-example/settings.gradle.kts
@@ -1 +1,12 @@
-rootProject.name = "thymeleaf-example"
+rootProject.name = "thymeleaf-example"
+
+includeBuild("..\\..\\thymeleaf"){
+    dependencySubstitution {
+        substitute(module("de.tschuehly:spring-view-component-thymeleaf")).using(project(":"))
+    }
+}
+includeBuild("..\\..\\core"){
+    dependencySubstitution {
+        substitute(module("de.tschuehly:spring-view-component-core")).using(project(":"))
+    }
+}