Skip to content

Commit c8651a6

Browse files
committed
Cleanup build, fix publishing
1 parent 5fdcd9b commit c8651a6

File tree

1 file changed

+20
-38
lines changed

1 file changed

+20
-38
lines changed

build.sbt

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,13 @@ scalaVersion := scala212Version
1212
lazy val commonSettings = Seq(
1313
scalaJSUseMainModuleInitializer := true, //Test only
1414
organization := "org.emergentorder.onnx",
15-
version := "1.6.0-0.1.0-SNAPSHOT",
15+
version := "v0.1.0-SNAPSHOT",
1616
resolvers += Resolver.mavenLocal,
1717
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
1818
updateOptions := updateOptions.value.withLatestSnapshots(false),
1919
scalacOptions ++= Seq("-feature", "-unchecked", "-deprecation", "-Ywarn-unused", "-Yrangepos"),
2020
autoCompilerPlugins := true,
21-
organization := "com.github.EmergentOrder",
22-
homepage := Some(url("https://github.com/EmergentOrder/onnx-scala")),
23-
scmInfo := Some(ScmInfo(url("https://github.com/EmergentOrder/onnx-scala"),
24-
"[email protected]:EmergentOrder/onnx-scala.git")),
25-
developers := List(Developer("EmergentOrder",
26-
"Alexander Merritt",
27-
28-
url("https://github.com/EmergentOrder"))),
29-
licenses += ("AGPL-3.0", url("https://www.gnu.org/licenses/agpl-3.0.html")),
30-
publishMavenStyle := true,
31-
publishTo := sonatypePublishToBundle.value
32-
)
21+
) ++ sonatypeSettings
3322

3423
lazy val common = (crossProject(JSPlatform, JVMPlatform)
3524
.crossType(CrossType.Pure) in file("common"))
@@ -55,7 +44,7 @@ lazy val commonJS = common.js
5544
.disablePlugins(dotty.tools.sbtplugin.DottyPlugin)
5645
.disablePlugins(dotty.tools.sbtplugin.DottyIDEPlugin)
5746

58-
lazy val programGenerator = (crossProject(JSPlatform, JVMPlatform)
47+
lazy val programGenerator = (crossProject(JVMPlatform)//,JSPlatform)
5948
.crossType(CrossType.Pure) in file("programGenerator"))
6049
.dependsOn(backends)
6150
.settings(
@@ -76,14 +65,14 @@ lazy val programGenerator = (crossProject(JSPlatform, JVMPlatform)
7665
scala213Version
7766
)
7867
)
79-
.jsSettings(
80-
crossScalaVersions := Seq(
81-
scala212Version,
82-
scala211Version,
83-
scala213Version
84-
)
85-
)
86-
lazy val backends = (crossProject(JVMPlatform, JSPlatform)
68+
// .jsSettings(
69+
// crossScalaVersions := Seq(
70+
// scala212Version,
71+
// scala211Version,
72+
// scala213Version
73+
// )
74+
// )
75+
lazy val backends = (crossProject(JVMPlatform) //JSPlatform)
8776
.crossType(CrossType.Pure) in file("backends"))
8877
.dependsOn(core)
8978
.settings(
@@ -97,9 +86,9 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
9786
.jvmSettings(
9887
crossScalaVersions := Seq(scala212Version, scala213Version, scala211Version)
9988
)
100-
.jsSettings(
101-
crossScalaVersions := Seq(scala212Version, scala211Version, scala213Version)
102-
)
89+
// .jsSettings(
90+
// crossScalaVersions := Seq(scala212Version, scala211Version, scala213Version)
91+
// )
10392
// .nativeSettings(
10493
// scalaVersion := scala211Version
10594
// )
@@ -152,10 +141,6 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
152141
),
153142
libraryDependencies ++= (CrossVersion
154143
.partialVersion(scalaVersion.value) match {
155-
case Some((2, n)) if (n == 13 || n == 11) =>
156-
Seq(
157-
"org.typelevel" %%% "spire" % spireVersion
158-
)
159144
case _ =>
160145
Seq(
161146
"org.typelevel" %%% "spire" % spireVersion
@@ -172,7 +157,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
172157
)
173158
*/
174159

175-
lazy val zio = (crossProject(JVMPlatform, JSPlatform)
160+
lazy val zio = (crossProject(JVMPlatform)//, JSPlatform)
176161
.crossType(CrossType.Pure) in file("zio"))
177162
.dependsOn(backends)
178163
.disablePlugins(dotty.tools.sbtplugin.DottyPlugin)
@@ -183,11 +168,6 @@ lazy val zio = (crossProject(JVMPlatform, JSPlatform)
183168
publishArtifact in (Compile, packageDoc) := false,
184169
libraryDependencies ++= (CrossVersion
185170
.partialVersion(scalaVersion.value) match {
186-
case Some((2, n)) if n == 13 =>
187-
Seq(
188-
//"org.typelevel" %% "cats-effect" % "2.0.0-M4"
189-
"dev.zio" %% "zio" % zioVersion
190-
)
191171
case _ =>
192172
Seq(
193173
"dev.zio" %% "zio" % zioVersion
@@ -197,9 +177,11 @@ lazy val zio = (crossProject(JVMPlatform, JSPlatform)
197177
.jvmSettings(
198178
crossScalaVersions := Seq(scala212Version, scala213Version, scala211Version)
199179
)
200-
.jsSettings(
201-
crossScalaVersions := Seq(scala212Version, scala211Version, scala213Version)
202-
)
180+
// .jsSettings(
181+
// crossScalaVersions := Seq(scala212Version, scala211Version, scala213Version)
182+
// )
183+
184+
skip in publish := true
203185

204186
lazy val sonatypeSettings = Seq(
205187
organization := "com.github.EmergentOrder",

0 commit comments

Comments
 (0)