Removed version from PROJECT.conf

pme123 · Jan 5, 2025 · 4292ec4 · 4292ec4
1 parent 9e68f34
commit 4292ec4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/03-api/src/main/scala/camundala/api/ApiProjectConfig.scala b/03-api/src/main/scala/camundala/api/ApiProjectConfig.scala
@@ -39,14 +39,8 @@ object ApiProjectConfig:
     val projectName    = projectConfig.getString("projectName")
     val projectVersion = projectConfig.getString("projectVersion")
     val subProjects    = projectConfig.getStringList("subProjects").asScala.toSeq
-    val dependencies   = projectConfig
-      .getObject("dependencies")
-      .unwrapped()
-      .asScala
-      .map:
-        case k -> v =>
-          DependencyConfig.apply(k, v.toString)
-      .toSeq
+    val dependencies   =
+      projectConfig.getStringList("dependencies").asScala.map(DependencyConfig.apply).toSeq
 
     ApiProjectConfig(
       projectName,
@@ -106,13 +100,8 @@ final case class DependencyConfig(
 end DependencyConfig
 
 object DependencyConfig:
-  def apply(projectName: String, version: String): DependencyConfig =
-    DependencyConfig(projectName, VersionConfig(version))
-  // "org:name:version" => DependencyConfig - only works for the company-project
-  def apply(dependency: String): DependencyConfig                   =
-    val dArray = dependency.replace("\"", "").split(":")
-    // DependencyConfig(dArray(0), dArray(1), dArray(2))
-    val lastVersion = VersionHelper.repoSearch(dArray(1), dArray(0))
-    DependencyConfig(dArray(1), VersionConfig(lastVersion))
+  def apply(projectName: String): DependencyConfig =
+    val lastVersion = VersionHelper.repoSearch(projectName)
+    DependencyConfig(projectName, VersionConfig(lastVersion))
 
 end DependencyConfig
diff --git a/03-api/src/main/scala/camundala/api/VersionHelper.scala b/03-api/src/main/scala/camundala/api/VersionHelper.scala
@@ -87,7 +87,7 @@ object VersionHelper:
         s"${Console.YELLOW_B}NOT FOUND!${Console.RESET} - Result from Maven Central:\n ${searchResult.out.text()}" +
           s"Check: cs complete-dep $org:$project:"
       )
-      s"VERSION NOT FOUND"
+      s"0.0.0"
 
     println(s"- Last Version of $org:$project: $version")
     version

diff --git a/03-api/src/test/PROJECT.conf b/03-api/src/test/PROJECT.conf
@@ -2,10 +2,10 @@
 projectName: mycompany-myProject
 projectVersion: 1.0.0-SNAPSHOT
 subProjects: [
-  subProject1, 
+  subProject1
   subProject2
 ]
-dependencies: {
-  mastercompany-services: 1.2.4
-  mycompany-commons: 1.0.3
-}
+dependencies: [
+  mastercompany-services
+  mycompany-commons
+]
diff --git a/03-api/src/test/scala/camundala/api/ApiProjectConfigTest.scala b/03-api/src/test/scala/camundala/api/ApiProjectConfigTest.scala
@@ -14,8 +14,8 @@ class ApiProjectConfigTest extends FunSuite:
         VersionConfig("1.0.0-SNAPSHOT"),
         Seq("subProject1", "subProject2"),
         Seq(
-          DependencyConfig("mastercompany-services", "1.2.4"),
-          DependencyConfig("mycompany-commons", "1.0.3")
+          DependencyConfig("mastercompany-services"),
+          DependencyConfig("mycompany-commons")
         )
       )
     )