Switch project structure

Author: Gentleman1983

.github/workflows/gradle_build.yml

@@ -13,6 +13,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: 'true'
       - uses: actions/setup-java@v4
         with:
           distribution: corretto

aoc2015/aoc2015-java/build.gradle.kts

@@ -1,8 +1,8 @@
 dependencies {
-    api(project(":utils"))
+    api(project(":aoc-utils"))
 
-    implementation(libs.commons.codec)
-    implementation(libs.commons.lang3)
+    implementation(aoc2015Libs.commons.codec)
+    implementation(aoc2015Libs.commons.lang3)
 
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

aoc2015/aoc2015-kotlin/build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    alias(aoc2015Libs.plugins.kotlin.jvm)
 }
 
 dependencies {
-    api(project(":utils"))
+    api(project(":aoc-utils"))
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

aoc2015/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     application
-    alias(libs.plugins.kotlin.jvm)
+    alias(aoc2015Libs.plugins.kotlin.jvm)
 }
 
 val year = 2015

build.gradle.kts

@@ -5,8 +5,8 @@ import org.sonarqube.gradle.SonarTask
 plugins {
     id("jacoco-report-aggregation")
     id("java-library")
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.sonarqube.plugin)
+    alias(aoc2015Libs.plugins.kotlin.jvm) apply false
+    alias(aoc2015Libs.plugins.sonarqube.plugin)
 }
 
 dependencies {
@@ -57,8 +57,8 @@ rootProject.allprojects.forEach { currentProject ->
     }
 
     currentProject.dependencies {
-        testImplementation(libs.hamcrest)
-        testImplementation(libs.junit.jupiter)
+        testImplementation(aoc2015Libs.hamcrest)
+        testImplementation(aoc2015Libs.junit.jupiter)
     }
 
     currentProject.jacoco {

img/groovy.png

@@ -2,12 +2,23 @@ plugins {
     id("com.gradle.develocity") version("4.0.2")
 }
 
-rootProject.name = "advent-of-code-2015"
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("aoc2015Libs") {
+            from(files("gradle/libs.versions.toml"))
+        }
+    }
+}
 
 include("aoc2015")
 include("aoc2015:aoc2015-java")
 include("aoc2015:aoc2015-kotlin")
 
-include("utils")
-include("utils:utils-java")
-include("utils:utils-kotlin")
+
+include("advent-of-code-utils")
+apply( "advent-of-code-utils/settings.gradle.kts")
+project(":aoc-utils").projectDir = file( path = "$rootDir/advent-of-code-utils/aoc-utils")
+project(":aoc-utils:aoc-utils-kotlin").projectDir = file( path = "$rootDir/advent-of-code-utils/aoc-utils/aoc-utils-kotlin")
+project(":aoc-utils:aoc-utils-java").projectDir = file( path = "$rootDir/advent-of-code-utils/aoc-utils/aoc-utils-java")
+
+rootProject.name = "advent-of-code-2015"