more sensible order of "common" settings

ghik · Mar 19, 2023 · 99ee6c3 · 99ee6c3
1 parent 13ca8e7
commit 99ee6c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/crossproject/src/main/scala/com/github/ghik/sbt/nosbt/crossproject/CrossProjectSupport.scala b/crossproject/src/main/scala/com/github/ghik/sbt/nosbt/crossproject/CrossProjectSupport.scala
@@ -1,7 +1,7 @@
 package com.github.ghik.sbt.nosbt
 package crossproject
 
-import com.avsystem.commons.misc.OptArg
+import com.avsystem.commons.*
 import sbtcrossproject.{CrossProject, CrossType, Platform}
 
 trait CrossProjectSupport { this: ProjectGroup =>

diff --git a/src/main/scala/com/github/ghik/sbt/nosbt/ProjectGroup.scala b/src/main/scala/com/github/ghik/sbt/nosbt/ProjectGroup.scala
@@ -76,10 +76,10 @@ abstract class ProjectGroup(
       .settings(allRootProjectSettings)
 
   protected final def allRootProjectSettings: Seq[Def.Setting[?]] =
-    commonSettings ++
-      directCommonSettings ++
-      parent.mapOr(Nil, _.commonSettings) ++
-      parent.mapOr(Nil, _.subProjectSettings)
+    parent.mapOr(Nil, _.commonSettings) ++
+      parent.mapOr(Nil, _.subProjectSettings) ++
+      commonSettings ++
+      directCommonSettings
 
   /**
    * Creates a subproject in this project group. This method should be used in a similar way that regular
@@ -96,14 +96,14 @@ abstract class ProjectGroup(
       .settings(allSubProjectSettings)
 
   protected final def allSubProjectSettings: Seq[Def.Setting[?]] =
-    commonSettings ++
+    parent.mapOr(Nil, _.commonSettings) ++
+      parent.mapOr(Nil, _.subProjectSettings) ++
+      parent.mapOr(Nil, _.leafProjectSettings) ++
+      commonSettings ++
       subProjectSettings ++
       leafProjectSettings ++
       directCommonSettings ++
-      directSubProjectSettings ++
-      parent.mapOr(Nil, _.commonSettings) ++
-      parent.mapOr(Nil, _.subProjectSettings) ++
-      parent.mapOr(Nil, _.leafProjectSettings)
+      directSubProjectSettings
 
   final def subprojects: Seq[Project] = discoveredProjects.get(this)