Skip to content

Commit

Permalink
Fix native compilation issue with annotation only packages (#416)
Browse files Browse the repository at this point in the history
* Don't cross-build annotations

* Switching back to using extensibility as the module name and added BuildInfo

* Rename module back to extensibility
  • Loading branch information
DamianReeves authored Sep 13, 2023
1 parent 44944d5 commit cb75c61
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
25 changes: 18 additions & 7 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ trait MorphirModule extends Cross.Module[String] with CrossPlatform { morphir =>
super.scalacOptions() ++ additionalOptions
}

def platformSpecificModuleDeps = Seq(annotations)
def platformSpecificModuleDeps = Seq(extensibility)
}

object jvm extends Shared with MorphirJVMModule
object js extends Shared with MorphirJSModule
object jvm extends Shared with MorphirJVMModule
object js extends Shared with MorphirJSModule
object native extends Shared with MorphirNativeModule

object contrib extends Module {
Expand Down Expand Up @@ -261,8 +261,19 @@ trait MorphirModule extends Cross.Module[String] with CrossPlatform { morphir =>
}
}

object annotations extends CrossPlatform with CrossValue {
trait Shared extends MorphirCommonCrossModule with MorphirPublishModule
object extensibility extends CrossPlatform with CrossValue {

trait Shared extends MorphirCommonCrossModule with MorphirPublishModule with BuildInfo {

def buildInfoPackageName = "org.finos.morphir.extensibility"

def buildInfoMembers = Seq(
BuildInfo.Value("version", publishVersion()),
BuildInfo.Value("scalaVersion", scalaVersion()),
BuildInfo.Value("platform", platform.toString)
)
}

object jvm extends Shared with MorphirJVMModule
object js extends Shared with MorphirJSModule
object native extends Shared with MorphirNativeModule
Expand Down Expand Up @@ -439,7 +450,7 @@ trait MorphirModule extends Cross.Module[String] with CrossPlatform { morphir =>
def ivyDeps = super.ivyDeps() ++ Agg(
Deps.com.lihaoyi.sourcecode
)
def platformSpecificModuleDeps = Seq(morphir, runtime, tools)
def platformSpecificModuleDeps = Seq(extensibility, morphir, runtime, tools)
}

object jvm extends Shared with MorphirJVMModule {
Expand Down Expand Up @@ -600,7 +611,7 @@ trait MorphirModule extends Cross.Module[String] with CrossPlatform { morphir =>
def docSources = T.sources {
Lib.findSourceFiles(super.docSources(), Seq("tasty"))
.map(PathRef(_))
//.filterNot(_.path.last.contains("ProcessIOPlat"))
// .filterNot(_.path.last.contains("ProcessIOPlat"))
}
}
object native extends Shared with MorphirNativeModule {
Expand Down

0 comments on commit cb75c61

Please sign in to comment.