Skip to content

Commit 5f4b956

Browse files
committed
Revert "Typesafe->Lightbend everywhere, in prep for 4.0.0 release"
This reverts commit 2649ae0.
1 parent 20f5ac9 commit 5f4b956

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ If you are looking for a version compatible with Scala 2.10, check out Scala Log
3232

3333
Scala Logging is published to Sonatype OSS and Maven Central:
3434

35-
- Group id / organization: *com.lightbend*
35+
- Group id / organization: *com.typesafe.scala-logging*
3636
- Artifact id / name: *scala-logging*
3737

3838
sbt users may add this to their `build.sbt`:
3939

4040
```scala
41-
libraryDependencies += "com.lightbend" %% "scala-logging" % "3.9.2"
41+
libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"
4242
```
4343

4444
## Using Scala Logging
4545

46-
The `Logger` class from the `com.lightbend.scalalogging` package wraps an underlying SLF4J logger.
46+
The `Logger` class from the `com.typesafe.scalalogging` package wraps an underlying SLF4J logger.
4747
In order to create a `Logger`, you pass a name to the `apply` factory method defined in the `Logger` companion object:
4848

4949
```scala
@@ -68,7 +68,7 @@ Or, using the runtime class wrapped by the implicit class tag parameter:
6868
val logger = Logger[MyClass]
6969
```
7070

71-
The `LazyLogging` and `StrictLogging` traits from the `com.lightbend.scalalogging` package define the `logger` member as
71+
The `LazyLogging` and `StrictLogging` traits from the `com.typesafe.scalalogging` package define the `logger` member as
7272
a lazy or strict value respectively. In both cases the underlying SLF4J logger is named according to the class into which
7373
these traits are mixed:
7474

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ scalacOptions ++= Seq(
1010
)
1111
incOptions := incOptions.value.withLogRecompileOnMacro(false)
1212
libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value)
13-
initialCommands := """|import com.lightbend.scalalogging._
13+
initialCommands := """|import com.typesafe.scalalogging._
1414
|import org.slf4j.{ Logger => Underlying, _ }""".stripMargin
1515

1616
// OSGi
1717

1818
import com.typesafe.sbt.osgi.SbtOsgi
1919
enablePlugins(SbtOsgi)
2020
osgiSettings
21-
OsgiKeys.bundleSymbolicName := "com.lightbend.scala-logging"
21+
OsgiKeys.bundleSymbolicName := "com.typesafe.scala-logging"
2222
OsgiKeys.privatePackage := Seq()
23-
OsgiKeys.exportPackage := Seq("com.lightbend.scalalogging*")
23+
OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging*")
2424

2525
// publishing
2626

27-
organization := "com.lightbend"
27+
organization := "com.typesafe.scala-logging"
2828
licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"))
2929
homepage := Some(url("https://github.com/lightbend/scala-logging"))
3030
Test / publishArtifact := false

src/main/scala/com/lightbend/scalalogging/Logger.scala renamed to src/main/scala/com/typesafe/scalalogging/Logger.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.slf4j.{ LoggerFactory, Marker, Logger => Underlying }
44
import scala.reflect.ClassTag

src/main/scala/com/lightbend/scalalogging/LoggerMacro.scala renamed to src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.slf4j.Marker
44
import scala.reflect.macros.blackbox

src/main/scala/com/lightbend/scalalogging/LoggerTakingImplicit.scala renamed to src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.slf4j.{ Marker, Logger => Underlying }
44

src/main/scala/com/lightbend/scalalogging/LoggerTakingImplicitMacro.scala renamed to src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.slf4j.Marker
44
import scala.reflect.macros.blackbox

src/main/scala/com/lightbend/scalalogging/Logging.scala renamed to src/main/scala/com/typesafe/scalalogging/Logging.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.slf4j.LoggerFactory
44

src/main/scala/com/lightbend/scalalogging/package.scala renamed to src/main/scala/com/typesafe/scalalogging/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend
1+
package com.typesafe
22

33
package object scalalogging {
44

src/test/scala/com/lightbend/scalalogging/LoggerSpec.scala renamed to src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.mockito.scalatest.MockitoSugar
44

src/test/scala/com/lightbend/scalalogging/LoggerTakingImplicitSpec.scala renamed to src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.mockito.scalatest.MockitoSugar
44
import org.slf4j.{ Logger => Underlying }

src/test/scala/com/lightbend/scalalogging/LoggerWithMarkerSpec.scala renamed to src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.mockito.scalatest.MockitoSugar
44

src/test/scala/com/lightbend/scalalogging/LoggerWithTaggedArgsSpec.scala renamed to src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lightbend.scalalogging
1+
package com.typesafe.scalalogging
22

33
import org.mockito.scalatest.MockitoSugar
44
import org.slf4j.{ Logger => Underlying }

0 commit comments

Comments
 (0)