16
16
17
17
import BuildSupport ._
18
18
import play .api .libs .json ._
19
+ import scala .io .Source
20
+ import scala .util .Using
19
21
20
22
lazy val packageData = Json
21
- .parse(scala.io.Source .fromFile(" ../../client/ts/package.json" ).mkString)
23
+ .parse(
24
+ Using (Source .fromFile(" ../../client/ts/package.json" ))(source =>
25
+ source.mkString
26
+ ).get
27
+ )
22
28
.as[JsObject ]
23
29
lazy val omegaVersion = packageData(" version" ).as[String ]
24
30
@@ -91,6 +97,10 @@ lazy val commonSettings = {
91
97
startYear := Some (2021 ),
92
98
publishTo := Some (ghb_resolver),
93
99
publishMavenStyle := true ,
100
+ publishConfiguration := publishConfiguration.value.withOverwrite(true ),
101
+ publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(
102
+ true
103
+ ),
94
104
credentials += Credentials (
95
105
" GitHub Package Registry" ,
96
106
" maven.pkg.github.com" ,
@@ -182,7 +192,13 @@ lazy val native = project
182
192
Artifact (" omega-edit-native" , " linux-aarch64" ) -> file(
183
193
s " ../../../../omega-edit-native_ ${scalaBinaryVersion.value}- ${version.value}-linux-aarch64.jar "
184
194
)
185
- )
195
+ ),
196
+ /** Not sure why these need added here since they are in common settings,
197
+ * but they are needed to not cause errors with publishM2.
198
+ */
199
+ publishConfiguration := publishConfiguration.value.withOverwrite(true ),
200
+ publishLocalConfiguration := publishLocalConfiguration.value
201
+ .withOverwrite(true )
186
202
)
187
203
.enablePlugins(BuildInfoPlugin , GitVersioning )
188
204
@@ -201,6 +217,8 @@ lazy val serv = project
201
217
" com.ctc" %% " omega-edit-native" % omegaVersion classifier s " macos-aarch64 " ,
202
218
" com.ctc" %% " omega-edit-native" % omegaVersion classifier s " windows-64 " ,
203
219
" com.monovore" %% " decline" % " 2.3.0" ,
220
+ " com.typesafe.akka" %% " akka-slf4j" % " 2.7.0" ,
221
+ " ch.qos.logback" % " logback-classic" % " 1.3.5" , // latest version that supports Java 8
204
222
" org.scalatest" %% " scalatest" % " 3.2.13" % Test
205
223
)
206
224
},
@@ -236,11 +254,23 @@ lazy val spi = project
236
254
.enablePlugins(GitVersioning )
237
255
238
256
addCommandAlias(
239
- " install " ,
257
+ " installM2 " ,
240
258
" ; clean; native/publishM2; test; api/publishM2; spi/publishM2"
241
259
)
260
+ addCommandAlias(
261
+ " installM2NoTest" ,
262
+ " ; clean; native/publishM2; api/publishM2; spi/publishM2"
263
+ )
242
264
addCommandAlias(" howMuchCoverage" , " ; clean; coverage; test; coverageAggregate" )
243
265
addCommandAlias(
244
266
" publishAll" ,
245
267
" ; clean; +native/publish; +api/publish; +spi/publish"
246
268
)
269
+ addCommandAlias(
270
+ " runServer" ,
271
+ " ; clean; serv/run"
272
+ )
273
+ addCommandAlias(
274
+ " pkgServer" ,
275
+ " ; clean; serv/Universal/packageBin"
276
+ )
0 commit comments