Skip to content

Commit f19b787

Browse files
committed
v0.9.53 [node_publish]
1 parent 218a4b8 commit f19b787

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

.github/release.sbt

+33-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,15 @@
1616

1717
import BuildSupport._
1818
import play.api.libs.json._
19+
import scala.io.Source
20+
import scala.util.Using
1921

2022
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+
)
2228
.as[JsObject]
2329
lazy val omegaVersion = packageData("version").as[String]
2430

@@ -91,6 +97,10 @@ lazy val commonSettings = {
9197
startYear := Some(2021),
9298
publishTo := Some(ghb_resolver),
9399
publishMavenStyle := true,
100+
publishConfiguration := publishConfiguration.value.withOverwrite(true),
101+
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(
102+
true
103+
),
94104
credentials += Credentials(
95105
"GitHub Package Registry",
96106
"maven.pkg.github.com",
@@ -182,7 +192,13 @@ lazy val native = project
182192
Artifact("omega-edit-native", "linux-aarch64") -> file(
183193
s"../../../../omega-edit-native_${scalaBinaryVersion.value}-${version.value}-linux-aarch64.jar"
184194
)
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)
186202
)
187203
.enablePlugins(BuildInfoPlugin, GitVersioning)
188204

@@ -201,6 +217,8 @@ lazy val serv = project
201217
"com.ctc" %% "omega-edit-native" % omegaVersion classifier s"macos-aarch64",
202218
"com.ctc" %% "omega-edit-native" % omegaVersion classifier s"windows-64",
203219
"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
204222
"org.scalatest" %% "scalatest" % "3.2.13" % Test
205223
)
206224
},
@@ -236,11 +254,23 @@ lazy val spi = project
236254
.enablePlugins(GitVersioning)
237255

238256
addCommandAlias(
239-
"install",
257+
"installM2",
240258
"; clean; native/publishM2; test; api/publishM2; spi/publishM2"
241259
)
260+
addCommandAlias(
261+
"installM2NoTest",
262+
"; clean; native/publishM2; api/publishM2; spi/publishM2"
263+
)
242264
addCommandAlias("howMuchCoverage", "; clean; coverage; test; coverageAggregate")
243265
addCommandAlias(
244266
"publishAll",
245267
"; clean; +native/publish; +api/publish; +spi/publish"
246268
)
269+
addCommandAlias(
270+
"runServer",
271+
"; clean; serv/run"
272+
)
273+
addCommandAlias(
274+
"pkgServer",
275+
"; clean; serv/Universal/packageBin"
276+
)

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.13)
1313

1414
# Project information
1515
project(omega_edit
16-
VERSION 0.9.52
16+
VERSION 0.9.53
1717
DESCRIPTION "Apache open source library for building editors"
1818
HOMEPAGE_URL "https://github.com/ctc-oss/omega-edit"
1919
LANGUAGES C CXX)

src/rpc/client/ts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "omega-edit",
3-
"version": "0.9.52",
3+
"version": "0.9.53",
44
"description": "OmegaEdit gRPC Client TypeScript Types",
55
"publisher": "ctc-oss",
66
"repository": {

0 commit comments

Comments
 (0)