Skip to content

Commit 575fd0a

Browse files
authoredAug 17, 2018
Merge pull request #167 from jonas/publish-fix
Fix publishing of bindings
2 parents 7835410 + d112842 commit 575fd0a

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed
 

Diff for: ‎build.sbt

+24-14
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ val root = project("scala-native-bindgen")
7474
releaseStepCommandAndRemaining("verify"),
7575
setReleaseVersion,
7676
tagRelease,
77-
releaseStepCommandAndRemaining("^publish"),
77+
releaseStepCommandAndRemaining("+bindings/publish"),
78+
releaseStepCommandAndRemaining("+tools/publish"),
79+
releaseStepCommandAndRemaining("^sbt-scala-native-bindgen/publish"),
7880
pushChanges,
7981
releaseStepTask(docs / ghpagesPushSite)
8082
)
@@ -99,19 +101,21 @@ lazy val tests = project("tests")
99101
)
100102
.aggregate(samples)
101103

102-
lazy val samples = project("samples")
104+
lazy val samples = nativeProject("samples")
103105
.in(file("tests/samples"))
104-
.enablePlugins(ScalaNativePlugin)
105106
.settings(
106107
publish / skip := true,
107-
scalaVersion := Versions.scala211,
108108
libraryDependencies += "com.lihaoyi" %%% "utest" % "0.6.3" % Test,
109109
testFrameworks += new TestFramework("utest.runner.Framework"),
110-
nativeLinkStubs := true,
111110
compileTask("bindgentests", baseDirectory)
112111
)
113112

114113
lazy val tools = project("tools")
114+
.settings(
115+
crossScalaVersions := List(Versions.scala210,
116+
Versions.scala211,
117+
Versions.scala212)
118+
)
115119

116120
lazy val sbtPlugin = project("sbt-scala-native-bindgen", ScriptedPlugin)
117121
.dependsOn(tools)
@@ -134,12 +138,11 @@ lazy val sbtPlugin = project("sbt-scala-native-bindgen", ScriptedPlugin)
134138
publishLocal := publishLocal.dependsOn(tools / publishLocal).value
135139
)
136140

137-
lazy val docs = project("docs")
141+
lazy val docs = nativeProject("docs")
138142
.enablePlugins(GhpagesPlugin, ParadoxSitePlugin, ParadoxMaterialThemePlugin)
139-
.enablePlugins(ScalaNativePlugin, ScalaNativeBindgenPlugin)
143+
.enablePlugins(ScalaNativeBindgenPlugin)
140144
.settings(
141145
publish / skip := true,
142-
scalaVersion := Versions.scala211,
143146
Test / nativeBindings += {
144147
NativeBinding((Test / resourceDirectory).value / "vector.h")
145148
.name("vector")
@@ -151,7 +154,6 @@ lazy val docs = project("docs")
151154
(ThisBuild / baseDirectory).value / "bindgen/target/scala-native-bindgen")
152155
},
153156
Test / nativeBindgen / target := (Test / scalaSource).value / "org/example",
154-
nativeLinkStubs := true,
155157
compileTask("vector", Test / resourceDirectory),
156158
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.0-SNAP10" % Test,
157159
Paradox / paradoxProperties ++= Map(
@@ -170,7 +172,8 @@ lazy val docs = project("docs")
170172

171173
lazy val bindings = project("bindings")
172174
.settings(
173-
publish / skip := false
175+
publish / skip := true,
176+
scalaVersion := Versions.scala211
174177
)
175178
.aggregate(
176179
libiconv,
@@ -226,6 +229,15 @@ def project(name: String, plugged: AutoPlugin*) = {
226229
)
227230
}
228231

232+
def nativeProject(name: String) = {
233+
project(name)
234+
.enablePlugins(ScalaNativePlugin)
235+
.settings(
236+
scalaVersion := Versions.scala211,
237+
nativeLinkStubs := true
238+
)
239+
}
240+
229241
def compileTask(libname: String, srcDirTask: SettingKey[File]) = Def.settings(
230242
Test / nativeLinkingOptions += {
231243
Seq("-L", (Test / target).value.getAbsoluteFile / "bindgen").mkString
@@ -284,12 +296,10 @@ lazy val bindingsExtraArgs = Try {
284296
}.toOption
285297

286298
def bindingProject(name: String) = {
287-
project(s"lib$name")
288-
.enablePlugins(ScalaNativePlugin, ScalaNativeBindgenPlugin)
299+
nativeProject(s"lib$name")
300+
.enablePlugins(ScalaNativeBindgenPlugin)
289301
.in(file(s"bindings/$name"))
290302
.settings(
291-
scalaVersion := Versions.scala211,
292-
nativeLinkStubs := true,
293303
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.0-SNAP10" % Test,
294304
Compile / nativeBindgen / target :=
295305
(Compile / scalaSource).value / "org/scalanative/bindgen/bindings" / name

0 commit comments

Comments
 (0)