Do not use crossProject with java modules

typelevel · Aug 3, 2022 · f24f9da · f24f9da
1 parent 35e926b
commit f24f9da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,11 +94,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p testkit/metrics/jvm/target testkit/common/jvm/target target java/common/.jvm/target core/common/.jvm/target .js/target site/target core/metrics/.jvm/target java/metrics/.jvm/target core/all/.js/target core/metrics/.js/target core/all/.jvm/target .jvm/target .native/target core/common/.js/target java/all/.jvm/target testkit/all/jvm/target project/target
+        run: mkdir -p testkit/metrics/jvm/target java/metrics/target testkit/common/jvm/target target core/common/.jvm/target .js/target site/target core/metrics/.jvm/target core/all/.js/target java/all/target java/common/target core/metrics/.js/target core/all/.jvm/target .jvm/target .native/target core/common/.js/target testkit/all/jvm/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar testkit/metrics/jvm/target testkit/common/jvm/target target java/common/.jvm/target core/common/.jvm/target .js/target site/target core/metrics/.jvm/target java/metrics/.jvm/target core/all/.js/target core/metrics/.js/target core/all/.jvm/target .jvm/target .native/target core/common/.js/target java/all/.jvm/target testkit/all/jvm/target project/target
+        run: tar cf targets.tar testkit/metrics/jvm/target java/metrics/target testkit/common/jvm/target target core/common/.jvm/target .js/target site/target core/metrics/.jvm/target core/all/.js/target java/all/target java/common/target core/metrics/.js/target core/all/.jvm/target .jvm/target .native/target core/common/.js/target testkit/all/jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')

diff --git a/build.sbt b/build.sbt
@@ -113,21 +113,19 @@ lazy val testkit = crossProject(JVMPlatform)
     name := "otel4s-testkit"
   )
 
-lazy val `java-common` = crossProject(JVMPlatform)
-  .crossType(CrossType.Pure)
+lazy val `java-common` = project
   .in(file("java/common"))
-  .dependsOn(`core-common`, `testkit-common`)
+  .dependsOn(`core-common`.jvm, `testkit-common`.jvm)
   .settings(
     name := "otel4s-java-common",
     libraryDependencies ++= Seq(
       "io.opentelemetry" % "opentelemetry-api" % OpenTelemetryVersion
     )
   )
 
-lazy val `java-metrics` = crossProject(JVMPlatform)
-  .crossType(CrossType.Pure)
+lazy val `java-metrics` = project
   .in(file("java/metrics"))
-  .dependsOn(`java-common`, `core-metrics`, `testkit-metrics`)
+  .dependsOn(`java-common`, `core-metrics`.jvm, `testkit-metrics`.jvm)
   .settings(
     name := "otel4s-java-metrics",
     libraryDependencies ++= Seq(
@@ -139,10 +137,9 @@ lazy val `java-metrics` = crossProject(JVMPlatform)
     )
   )
 
-lazy val java = crossProject(JVMPlatform)
-  .crossType(CrossType.Pure)
+lazy val java = project
   .in(file("java/all"))
-  .dependsOn(core, `java-metrics`)
+  .dependsOn(core.jvm, `java-metrics`)
   .settings(
     name := "otel4s-java"
   )