build: use composite build instead of buildSrc

digitalservicebund · Dec 5, 2023 · e9a6580 · e9a6580
1 parent 4181f73
commit e9a6580
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 2 deletions.
diff --git a/buildSrc/build.gradle.kts → gradle-conventions/build.gradle.kts b/buildSrc/build.gradle.kts → gradle-conventions/build.gradle.kts
diff --git a/buildSrc/settings.gradle.kts → gradle-conventions/settings.gradle.kts b/buildSrc/settings.gradle.kts → gradle-conventions/settings.gradle.kts
diff --git a/...italservice.kotlin-conventions.gradle.kts → ...italservice.kotlin-conventions.gradle.kts b/...italservice.kotlin-conventions.gradle.kts → ...italservice.kotlin-conventions.gradle.kts
diff --git a/...ice.license-report-conventions.gradle.kts → ...ice.license-report-conventions.gradle.kts b/...ice.license-report-conventions.gradle.kts → ...ice.license-report-conventions.gradle.kts
diff --git a/...gitalservice.sonar-conventions.gradle.kts → ...gitalservice.sonar-conventions.gradle.kts b/...gitalservice.sonar-conventions.gradle.kts → ...gitalservice.sonar-conventions.gradle.kts
diff --git a/...alservice.spotless-conventions.gradle.kts → ...alservice.spotless-conventions.gradle.kts b/...alservice.spotless-conventions.gradle.kts → ...alservice.spotless-conventions.gradle.kts
@@ -19,8 +19,8 @@ spotless {
             "**/*.yml",
         )
         targetExclude(
-            "buildSrc/.gradle/**",
-            "buildSrc/build/**",
+            "gradle-conventions/.gradle/**",
+            "gradle-conventions/build/**",
         )
         prettier(
             mapOf(

diff --git a/....spring-boot-image-conventions.gradle.kts → ....spring-boot-image-conventions.gradle.kts b/....spring-boot-image-conventions.gradle.kts → ....spring-boot-image-conventions.gradle.kts
diff --git a/...igitalservice.test-conventions.gradle.kts → ...igitalservice.test-conventions.gradle.kts b/...igitalservice.test-conventions.gradle.kts → ...igitalservice.test-conventions.gradle.kts
diff --git a/...ce.version-catalog-conventions.gradle.kts → ...ce.version-catalog-conventions.gradle.kts b/...ce.version-catalog-conventions.gradle.kts → ...ce.version-catalog-conventions.gradle.kts
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,7 @@
 rootProject.name = "kotlin-application-template"
 
+includeBuild("gradle-conventions")
+
 @Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)