diff --git a/build.sbt b/build.sbt index 7d248f16..c8bb2620 100644 --- 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 index d0367654..0b5ecc0f 100644 --- 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 index 28410bf2..f219436e 100644 --- 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 index 149c2e70..d6c8de14 100644 --- 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 index 737d0c4e..7c85caa2 100644 --- 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 index 9bc4f422..f143960a 100644 --- 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 index 00b5c7e8..14abbbe9 100644 --- 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 index fa9b2482..dd2ed730 100644 --- 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 index c370e8f6..c8f7ebb3 100644 --- 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 index 96d08df5..7d94b927 100644 --- 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 index 52c199e3..d7077d0d 100644 --- 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/core/shared/src/test/scala/org/typelevel/log4cats/extras/syntax/LoggerSyntaxCompilation.scala b/core/shared/src/test/scala/org/typelevel/log4cats/extras/syntax/LoggerSyntaxCompilation.scala index 947df373..f2d1bde2 100644 --- a/core/shared/src/test/scala/org/typelevel/log4cats/extras/syntax/LoggerSyntaxCompilation.scala +++ b/core/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 index 3df0d4b0..7050b55e 100644 --- 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 index e64c208f..3161d214 100644 --- 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 index 091ea67a..c509f972 100644 --- 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 index 8e1cd7d8..5b2e4751 100644 --- 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 index a85a8b62..c2599b51 100644 --- 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 index 11181ab7..d4bb1edd 100644 --- 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 index 5d0e84f5..3776fcbb 100644 --- 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 index 72ae1482..b35b331b 100644 --- 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 index edb2e91e..566413e7 100644 --- 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 index fc76776e..9e81d1d7 100644 --- 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 index 07237cfd..f1d7607c 100644 --- 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 index f16c8db7..9ecbf070 100644 --- 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.