From 96305cb98a83d6d71c1f57007596a3cdc53d40d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?= Date: Fri, 28 Nov 2025 14:38:22 +0800 Subject: [PATCH 1/3] fix publish failed in build.sbt --- build.sbt | 60 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/build.sbt b/build.sbt index 4856a04..d93415c 100644 --- a/build.sbt +++ b/build.sbt @@ -16,6 +16,33 @@ val scalacOption = Def.setting { } lazy val root = (project in file(".")).aggregate(core, scala2macros) +.settings( + publish / skip := true +) + +lazy val publish = Seq( + licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")), + homepage := Some(url("https://github.com/lightbend/scala-logging")), + Test / publishArtifact := false, + pomIncludeRepository := (_ => false), + scmInfo := Some( + ScmInfo(url("https://github.com/lightbend/scala-logging"), "scm:git:git@github.com:lightbend/scala-logging.git") + ), + developers := List( + Developer( + id = "hseeberger", + name = "Heiko Seeberger", + email = "", + url = url("http://heikoseeberger.de") + ), + Developer( + id = "analytically", + name = "Mathias Bogaert", + email = "", + url = url("http://twitter.com/analytically") + ) + )) +) lazy val core = (project in file("core")) .enablePlugins(SbtOsgi) @@ -37,34 +64,13 @@ lazy val core = (project in file("core")) |import org.slf4j.{ Logger => Underlying, _ }""".stripMargin ).settings( // OSGi - osgiSettings + osgiSettings, + publish ).settings( OsgiKeys.bundleSymbolicName := "com.typesafe.scala-logging", OsgiKeys.privatePackage := Seq(), - OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging*"), - - // publishing - licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")), - homepage := Some(url("https://github.com/lightbend/scala-logging")), - Test / publishArtifact := false, - pomIncludeRepository := (_ => false), - scmInfo := Some( - ScmInfo(url("https://github.com/lightbend/scala-logging"), "scm:git:git@github.com:lightbend/scala-logging.git") - ), - developers := List( - Developer( - id = "hseeberger", - name = "Heiko Seeberger", - email = "", - url = url("http://heikoseeberger.de") - ), - Developer( - id = "analytically", - name = "Mathias Bogaert", - email = "", - url = url("http://twitter.com/analytically") - ) - )) + OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging*") +) .dependsOn(scala2macros) lazy val scala2macros = project @@ -73,7 +79,7 @@ lazy val scala2macros = project scalaVersion := scala213, crossScalaVersions := scala2, libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, false), - ) + ).settings(publish) lazy val `integration-test` = project.in(file("integration-test")) .settings( @@ -92,4 +98,4 @@ lazy val `integration-test` = project.in(file("integration-test")) scalaTest % "test" ) ) - .dependsOn(core) \ No newline at end of file + .dependsOn(core) From 724b7cc3c71081b7eff3eeaf64cb632bed9211e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?= Date: Fri, 28 Nov 2025 14:40:12 +0800 Subject: [PATCH 2/3] Fix indentation in build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d93415c..a65ce88 100644 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,7 @@ lazy val publish = Seq( email = "", url = url("http://twitter.com/analytically") ) - )) + ) ) lazy val core = (project in file("core")) From a5da09b99ff6abbf666fbcc7c903995141f68092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?= Date: Fri, 28 Nov 2025 14:43:25 +0800 Subject: [PATCH 3/3] Update build.sbt --- build.sbt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index a65ce88..f84d812 100644 --- a/build.sbt +++ b/build.sbt @@ -16,11 +16,11 @@ val scalacOption = Def.setting { } lazy val root = (project in file(".")).aggregate(core, scala2macros) -.settings( - publish / skip := true -) + .settings( + publish / skip := true + ) -lazy val publish = Seq( +lazy val publishSettings = Seq( licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")), homepage := Some(url("https://github.com/lightbend/scala-logging")), Test / publishArtifact := false, @@ -65,7 +65,7 @@ lazy val core = (project in file("core")) ).settings( // OSGi osgiSettings, - publish + publishSettings ).settings( OsgiKeys.bundleSymbolicName := "com.typesafe.scala-logging", OsgiKeys.privatePackage := Seq(), @@ -79,7 +79,7 @@ lazy val scala2macros = project scalaVersion := scala213, crossScalaVersions := scala2, libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, false), - ).settings(publish) + ).settings(publishSettings) lazy val `integration-test` = project.in(file("integration-test")) .settings(