Merge pull request #583 from danicheg/merge-series/1.x-into-main

Merge `series/1.x` into `main`
typelevel · Jan 12, 2022 · bb587ce · bb587ce
2 parents f87b57f + c0360a9
commit bb587ce
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 39 deletions.
diff --git a/build.sbt b/build.sbt
@@ -7,6 +7,7 @@ val Scala3 = "3.0.2"
 enablePlugins(SonatypeCiReleasePlugin)
 
 ThisBuild / organization := "org.typelevel"
+ThisBuild / organizationName := "Typelevel"
 ThisBuild / baseVersion := "2.1"
 ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, Scala3)
 ThisBuild / scalaVersion := Scala213

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/ErrorLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/ErrorLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/Logger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/Logger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/MessageLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/MessageLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/SelfAwareLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/SelfAwareLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/SelfAwareStructuredLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/SelfAwareStructuredLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/StructuredLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/StructuredLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/LogLevel.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/LogLevel.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/LogMessage.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/LogMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterTLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterTLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../shared/src/test/scala/org/typelevel/log4cats/extras/syntax/LoggerSyntaxCompilation.scala b/.../shared/src/test/scala/org/typelevel/log4cats/extras/syntax/LoggerSyntaxCompilation.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala b/noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.8
+sbt.version=1.6.1
diff --git a/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/Slf4jLogger.scala b/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/Slf4jLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala b/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala
@@ -1,21 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright 2020 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/main/scala-3/org/typelevel/log4cats/slf4j/Slf4jLogger.scala b/slf4j/src/main/scala-3/org/typelevel/log4cats/slf4j/Slf4jLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/main/scala-3/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala b/slf4j/src/main/scala-3/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/main/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala b/slf4j/src/main/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/Hygiene.scala b/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/Hygiene.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/Slf4jLoggerMacroCompilationTests.scala b/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/Slf4jLoggerMacroCompilationTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternalSuite.scala b/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternalSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/testing/shared/src/main/scala/org/typelevel/log4cats/testing/StructuredTestingLogger.scala b/testing/shared/src/main/scala/org/typelevel/log4cats/testing/StructuredTestingLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/testing/shared/src/main/scala/org/typelevel/log4cats/testing/TestingLogger.scala b/testing/shared/src/main/scala/org/typelevel/log4cats/testing/TestingLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Christopher Davenport
+ * Copyright 2018 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.