From 81261512f1a42624d599196dff61d09dca0f0e0f Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sun, 18 Sep 2022 23:32:39 +0200
Subject: [PATCH] rename 'convention' package to 'conventions'

---
 gradle-plugins/builder-plugins/settings.gradle.kts            | 2 +-
 gradle-plugins/docker-compose/settings.gradle.kts             | 2 +-
 .../build.gradle.kts                                          | 0
 .../settings.gradle.kts                                       | 2 +-
 .../{convention => conventions}/settings/repositories.kt      | 0
 .../settings/repositories.settings.gradle.kts                 | 2 +-
 settings.gradle.kts                                           | 4 ++--
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename gradle-plugins/{factorio-mod-manager => factorio-gradle}/build.gradle.kts (100%)
 rename gradle-plugins/{factorio-mod-manager => factorio-gradle}/settings.gradle.kts (85%)
 rename gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/{convention => conventions}/settings/repositories.kt (100%)
 rename gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/{convention => conventions}/settings/repositories.settings.gradle.kts (94%)

diff --git a/gradle-plugins/builder-plugins/settings.gradle.kts b/gradle-plugins/builder-plugins/settings.gradle.kts
index fa59505..039eed3 100644
--- a/gradle-plugins/builder-plugins/settings.gradle.kts
+++ b/gradle-plugins/builder-plugins/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-  id("kafkatorio.convention.settings.repositories")
+  id("kafkatorio.conventions.settings.repositories")
 }
 
 dependencyResolutionManagement {
diff --git a/gradle-plugins/docker-compose/settings.gradle.kts b/gradle-plugins/docker-compose/settings.gradle.kts
index c0f0cd1..2ebeaa3 100644
--- a/gradle-plugins/docker-compose/settings.gradle.kts
+++ b/gradle-plugins/docker-compose/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-  id("kafkatorio.convention.settings.repositories")
+  id("kafkatorio.conventions.settings.repositories")
 }
 
 dependencyResolutionManagement {
diff --git a/gradle-plugins/factorio-mod-manager/build.gradle.kts b/gradle-plugins/factorio-gradle/build.gradle.kts
similarity index 100%
rename from gradle-plugins/factorio-mod-manager/build.gradle.kts
rename to gradle-plugins/factorio-gradle/build.gradle.kts
diff --git a/gradle-plugins/factorio-mod-manager/settings.gradle.kts b/gradle-plugins/factorio-gradle/settings.gradle.kts
similarity index 85%
rename from gradle-plugins/factorio-mod-manager/settings.gradle.kts
rename to gradle-plugins/factorio-gradle/settings.gradle.kts
index d6f8766..a417a13 100644
--- a/gradle-plugins/factorio-mod-manager/settings.gradle.kts
+++ b/gradle-plugins/factorio-gradle/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-  id("kafkatorio.convention.settings.repositories")
+  id("kafkatorio.conventions.settings.repositories")
 }
 
 dependencyResolutionManagement {
diff --git a/gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/convention/settings/repositories.kt b/gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/conventions/settings/repositories.kt
similarity index 100%
rename from gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/convention/settings/repositories.kt
rename to gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/conventions/settings/repositories.kt
diff --git a/gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/convention/settings/repositories.settings.gradle.kts b/gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/conventions/settings/repositories.settings.gradle.kts
similarity index 94%
rename from gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/convention/settings/repositories.settings.gradle.kts
rename to gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/conventions/settings/repositories.settings.gradle.kts
index 6bca2b5..e49aed8 100644
--- a/gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/convention/settings/repositories.settings.gradle.kts
+++ b/gradle-plugins/settings-plugins/src/main/kotlin/kafkatorio/conventions/settings/repositories.settings.gradle.kts
@@ -1,4 +1,4 @@
-package kafkatorio.convention.settings
+package kafkatorio.conventions.settings
 
 @Suppress("UnstableApiUsage") // Central declaration of repositories is an incubating feature
 dependencyResolutionManagement {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4b7f0b3..8cc8ca9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,11 +9,11 @@ pluginManagement {
 
 includeBuild("./gradle-plugins/builder-plugins/")
 includeBuild("./gradle-plugins/docker-compose/")
-includeBuild("./gradle-plugins/factorio-mod-manager/")
+includeBuild("./gradle-plugins/factorio-gradle/")
 
 
 plugins {
-  id("kafkatorio.convention.settings.repositories")
+  id("kafkatorio.conventions.settings.repositories")
 }