From adcac0a753e837e0474ac85902190c105c8dacca Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Thu, 17 Aug 2023 23:01:36 +0200
Subject: [PATCH] Upgrade to KVision 7.0.0 - missing changes

---
 .../src/jvmMain/resources/application.conf                 | 2 +-
 .../src/jvmMain/resources/application.conf                 | 2 +-
 addressbook-fullstack-spring-boot/settings.gradle.kts      | 7 -------
 .../src/jvmMain/resources/application.conf                 | 2 +-
 .../src/jvmMain/resources/application.conf                 | 2 +-
 numbers-fullstack-spring-boot/settings.gradle.kts          | 7 -------
 .../src/jvmMain/resources/application.conf                 | 2 +-
 .../src/jvmMain/resources/application.conf                 | 2 +-
 .../src/jvmMain/resources/application.conf                 | 2 +-
 template-fullstack-spring-boot/settings.gradle.kts         | 7 -------
 .../src/jvmMain/resources/application.conf                 | 2 +-
 .../src/jvmMain/resources/application.conf                 | 2 +-
 tweets-fullstack-spring-boot-sse/settings.gradle.kts       | 7 -------
 tweets-fullstack-spring-boot/settings.gradle.kts           | 7 -------
 14 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/addressbook-fullstack-ktor-koin/src/jvmMain/resources/application.conf b/addressbook-fullstack-ktor-koin/src/jvmMain/resources/application.conf
index dcd1ae01..d8a6c90f 100644
--- a/addressbook-fullstack-ktor-koin/src/jvmMain/resources/application.conf
+++ b/addressbook-fullstack-ktor-koin/src/jvmMain/resources/application.conf
@@ -1,7 +1,7 @@
 ktor {
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/addressbook-fullstack-ktor/src/jvmMain/resources/application.conf b/addressbook-fullstack-ktor/src/jvmMain/resources/application.conf
index dcd1ae01..d8a6c90f 100644
--- a/addressbook-fullstack-ktor/src/jvmMain/resources/application.conf
+++ b/addressbook-fullstack-ktor/src/jvmMain/resources/application.conf
@@ -1,7 +1,7 @@
 ktor {
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/addressbook-fullstack-spring-boot/settings.gradle.kts b/addressbook-fullstack-spring-boot/settings.gradle.kts
index 099263ab..456a379d 100644
--- a/addressbook-fullstack-spring-boot/settings.gradle.kts
+++ b/addressbook-fullstack-spring-boot/settings.gradle.kts
@@ -4,12 +4,5 @@ pluginManagement {
         mavenCentral()
         mavenLocal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            when {
-                requested.id.id == "org.springframework.boot" -> useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-            }
-        }
-    }
 }
 rootProject.name = "addressbook-fullstack-spring-boot"
diff --git a/encoder-fullstack-ktor/src/jvmMain/resources/application.conf b/encoder-fullstack-ktor/src/jvmMain/resources/application.conf
index cedbc971..6aa8cc86 100644
--- a/encoder-fullstack-ktor/src/jvmMain/resources/application.conf
+++ b/encoder-fullstack-ktor/src/jvmMain/resources/application.conf
@@ -1,7 +1,7 @@
 ktor {
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/numbers-fullstack-ktor/src/jvmMain/resources/application.conf b/numbers-fullstack-ktor/src/jvmMain/resources/application.conf
index cedbc971..6aa8cc86 100644
--- a/numbers-fullstack-ktor/src/jvmMain/resources/application.conf
+++ b/numbers-fullstack-ktor/src/jvmMain/resources/application.conf
@@ -1,7 +1,7 @@
 ktor {
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/numbers-fullstack-spring-boot/settings.gradle.kts b/numbers-fullstack-spring-boot/settings.gradle.kts
index 2106dc0f..68ecc98f 100644
--- a/numbers-fullstack-spring-boot/settings.gradle.kts
+++ b/numbers-fullstack-spring-boot/settings.gradle.kts
@@ -4,12 +4,5 @@ pluginManagement {
         mavenCentral()
         mavenLocal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            when {
-                requested.id.id == "org.springframework.boot" -> useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-            }
-        }
-    }
 }
 rootProject.name = "numbers-fullstack-spring-boot"
diff --git a/template-fullstack-ktor-koin-annotations/src/jvmMain/resources/application.conf b/template-fullstack-ktor-koin-annotations/src/jvmMain/resources/application.conf
index db79f349..d27e22e0 100644
--- a/template-fullstack-ktor-koin-annotations/src/jvmMain/resources/application.conf
+++ b/template-fullstack-ktor-koin-annotations/src/jvmMain/resources/application.conf
@@ -2,7 +2,7 @@ ktor {
   development = true
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/template-fullstack-ktor-koin/src/jvmMain/resources/application.conf b/template-fullstack-ktor-koin/src/jvmMain/resources/application.conf
index db79f349..d27e22e0 100644
--- a/template-fullstack-ktor-koin/src/jvmMain/resources/application.conf
+++ b/template-fullstack-ktor-koin/src/jvmMain/resources/application.conf
@@ -2,7 +2,7 @@ ktor {
   development = true
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/template-fullstack-ktor/src/jvmMain/resources/application.conf b/template-fullstack-ktor/src/jvmMain/resources/application.conf
index db79f349..d27e22e0 100644
--- a/template-fullstack-ktor/src/jvmMain/resources/application.conf
+++ b/template-fullstack-ktor/src/jvmMain/resources/application.conf
@@ -2,7 +2,7 @@ ktor {
   development = true
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/template-fullstack-spring-boot/settings.gradle.kts b/template-fullstack-spring-boot/settings.gradle.kts
index 8a16a59f..e8548a1e 100644
--- a/template-fullstack-spring-boot/settings.gradle.kts
+++ b/template-fullstack-spring-boot/settings.gradle.kts
@@ -4,12 +4,5 @@ pluginManagement {
         mavenCentral()
         mavenLocal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            when {
-                requested.id.id == "org.springframework.boot" -> useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-            }
-        }
-    }
 }
 rootProject.name = "template-fullstack-spring-boot"
diff --git a/tweets-fullstack-ktor-koin/src/jvmMain/resources/application.conf b/tweets-fullstack-ktor-koin/src/jvmMain/resources/application.conf
index cedbc971..6aa8cc86 100644
--- a/tweets-fullstack-ktor-koin/src/jvmMain/resources/application.conf
+++ b/tweets-fullstack-ktor-koin/src/jvmMain/resources/application.conf
@@ -1,7 +1,7 @@
 ktor {
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/tweets-fullstack-ktor/src/jvmMain/resources/application.conf b/tweets-fullstack-ktor/src/jvmMain/resources/application.conf
index cedbc971..6aa8cc86 100644
--- a/tweets-fullstack-ktor/src/jvmMain/resources/application.conf
+++ b/tweets-fullstack-ktor/src/jvmMain/resources/application.conf
@@ -1,7 +1,7 @@
 ktor {
   deployment {
     port = 8080
-    watch = [build/classes/kotlin/backend/main]
+    watch = [build/classes/kotlin/jvm/main]
   }
 
   application {
diff --git a/tweets-fullstack-spring-boot-sse/settings.gradle.kts b/tweets-fullstack-spring-boot-sse/settings.gradle.kts
index a111973f..830120fa 100644
--- a/tweets-fullstack-spring-boot-sse/settings.gradle.kts
+++ b/tweets-fullstack-spring-boot-sse/settings.gradle.kts
@@ -4,12 +4,5 @@ pluginManagement {
         mavenCentral()
         mavenLocal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            when {
-                requested.id.id == "org.springframework.boot" -> useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-            }
-        }
-    }
 }
 rootProject.name = "tweets-fullstack-spring-boot-sse"
diff --git a/tweets-fullstack-spring-boot/settings.gradle.kts b/tweets-fullstack-spring-boot/settings.gradle.kts
index 4f9950c7..66e90c52 100644
--- a/tweets-fullstack-spring-boot/settings.gradle.kts
+++ b/tweets-fullstack-spring-boot/settings.gradle.kts
@@ -4,12 +4,5 @@ pluginManagement {
         mavenCentral()
         mavenLocal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            when {
-                requested.id.id == "org.springframework.boot" -> useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-            }
-        }
-    }
 }
 rootProject.name = "tweets-fullstack-spring-boot"