Merge pull request #156 from armanbilge/fix/cross-project-base-dir

Fix `crossProjectBaseDirectory`
portable-scala · Apr 17, 2023 · c030519 · c030519
2 parents a07d717 + 4972b7c
commit c030519
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/sbt-crossproject-test/src/sbt-test/new-api/detection/build.sbt b/sbt-crossproject-test/src/sbt-test/new-api/detection/build.sbt
@@ -9,7 +9,7 @@ def doCheckType(got: CrossType, expected: CrossType) =
   assert(got == expected)
 
 def doCheckBase(got: File, expected: File) =
-  assert(got == expected)
+  assert(got == expected.getAbsoluteFile)
 
 lazy val root =
   crossProject(JVMPlatform, NativePlatform, JSPlatform)
@@ -64,3 +64,28 @@ lazy val fullCross =
         doCheckBase(crossProjectBaseDirectory.value, file("fullCross"))
       }
     )
+
+lazy val nonDefaultBase =
+  crossProject(JVMPlatform, NativePlatform, JSPlatform)
+    .in(file("non-default-base"))
+    .jvmSettings(
+      check := {
+        doCheckPlatform(crossProjectPlatform.value, "jvm")
+        doCheckType(crossProjectCrossType.value, CrossType.Full)
+        doCheckBase(crossProjectBaseDirectory.value, file("non-default-base"))
+      }
+    )
+    .jsSettings(
+      check := {
+        doCheckPlatform(crossProjectPlatform.value, "js")
+        doCheckType(crossProjectCrossType.value, CrossType.Full)
+        doCheckBase(crossProjectBaseDirectory.value, file("non-default-base"))
+      }
+    )
+    .nativeSettings(
+      check := {
+        doCheckPlatform(crossProjectPlatform.value, "native")
+        doCheckType(crossProjectCrossType.value, CrossType.Full)
+        doCheckBase(crossProjectBaseDirectory.value, file("non-default-base"))
+      }
+    )
diff --git a/sbt-crossproject-test/src/sbt-test/new-api/detection/test b/sbt-crossproject-test/src/sbt-test/new-api/detection/test
@@ -4,3 +4,6 @@
 > fullCrossJVM/check
 > fullCrossJS/check
 > fullCrossNative/check
+> nonDefaultBaseJVM/check
+> nonDefaultBaseJS/check
+> nonDefaultBaseNative/check
diff --git a/sbt-crossproject/src/main/scala/sbtcrossproject/CrossProject.scala b/sbt-crossproject/src/main/scala/sbtcrossproject/CrossProject.scala
@@ -84,8 +84,12 @@ final class CrossProject private[sbtcrossproject] (
     configurePlatforms(platforms: _*)(_.enablePlugins(plugins: _*))
 
   def in(dir: File): CrossProject =
-    mapProjectsByPlatform(
-      (platform, project) => project.in(crossType.platformDir(dir, platform)))
+    settings(
+      CrossPlugin.autoImport.crossProjectBaseDirectory :=
+        IO.resolve((LocalRootProject / baseDirectory).value, dir)
+    ).mapProjectsByPlatform { (platform, project) =>
+      project.in(crossType.platformDir(dir, platform))
+    }
 
   def overrideConfigs(cs: Configuration*): CrossProject =
     transform(_.overrideConfigs(cs: _*))
@@ -205,7 +209,8 @@ object CrossProject {
             ).settings(
               CrossPlugin.autoImport.crossProjectPlatform := platform,
               CrossPlugin.autoImport.crossProjectCrossType := crossType,
-              CrossPlugin.autoImport.crossProjectBaseDirectory := base,
+              CrossPlugin.autoImport.crossProjectBaseDirectory :=
+                IO.resolve((LocalRootProject / baseDirectory).value, base),
               name := id, // #80
               sharedSrc(platform),
               sharedResources(platform)