From d199b489a85149e53feed5e55c98b676d0ee13ea Mon Sep 17 00:00:00 2001 From: danicheg Date: Sat, 8 Jan 2022 14:31:50 +0300 Subject: [PATCH 1/3] Set organizationName in the build.sbt --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index e6bed144..defb5919 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 := "1.3" ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, Scala3) ThisBuild / scalaVersion := Scala213 From 7efc5e57e7f7163fe7d3778bb703cabb281057a3 Mon Sep 17 00:00:00 2001 From: danicheg Date: Sat, 8 Jan 2022 14:33:22 +0300 Subject: [PATCH 2/3] Regenerate headers --- .../src/main/scala/org/typelevel/log4cats/ErrorLogger.scala | 2 +- core/shared/src/main/scala/org/typelevel/log4cats/Logger.scala | 2 +- .../src/main/scala/org/typelevel/log4cats/MessageLogger.scala | 2 +- .../src/main/scala/org/typelevel/log4cats/SelfAwareLogger.scala | 2 +- .../org/typelevel/log4cats/SelfAwareStructuredLogger.scala | 2 +- .../main/scala/org/typelevel/log4cats/StructuredLogger.scala | 2 +- .../src/main/scala/org/typelevel/log4cats/extras/LogLevel.scala | 2 +- .../main/scala/org/typelevel/log4cats/extras/LogMessage.scala | 2 +- .../main/scala/org/typelevel/log4cats/extras/Translate.scala | 2 +- .../main/scala/org/typelevel/log4cats/extras/WriterLogger.scala | 2 +- .../scala/org/typelevel/log4cats/extras/WriterTLogger.scala | 2 +- .../src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala | 2 +- .../main/scala-2/org/typelevel/log4cats/slf4j/Slf4jLogger.scala | 2 +- .../org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala | 2 +- .../typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala | 2 +- slf4j/src/test/scala/org/typelevel/log4cats/slf4j/Hygiene.scala | 2 +- .../log4cats/slf4j/Slf4jLoggerMacroCompilationTests.scala | 2 +- .../log4cats/slf4j/internal/Slf4jLoggerInternalSuite.scala | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) 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/Translate.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/Translate.scala index 8fded4b2..2b2ccba6 100644 --- a/core/shared/src/main/scala/org/typelevel/log4cats/extras/Translate.scala +++ b/core/shared/src/main/scala/org/typelevel/log4cats/extras/Translate.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/noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala b/noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala index 0774c271..369e552c 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/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/Slf4jLogger.scala b/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/Slf4jLogger.scala index 7c33f650..fa89a091 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 f3aae880..539b7e66 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,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 2fa361ea..4e7f3043 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. From 02fafa7867bee2d4f42a23df896282fdbf2eeea7 Mon Sep 17 00:00:00 2001 From: danicheg Date: Sat, 8 Jan 2022 14:37:40 +0300 Subject: [PATCH 3/3] Fix header of the GetLoggerMacros --- .../extras/syntax/LoggerSyntaxCompilation.scala | 2 +- .../slf4j/internal/GetLoggerMacros.scala | 16 ---------------- .../typelevel/log4cats/slf4j/Slf4jLogger.scala | 2 +- .../slf4j/internal/GetLoggerMacros.scala | 2 +- .../testing/StructuredTestingLogger.scala | 2 +- .../log4cats/testing/TestingLogger.scala | 2 +- 6 files changed, 5 insertions(+), 21 deletions(-) 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/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 539b7e66..b5596a53 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 @@ -14,22 +14,6 @@ * limitations under the License. */ -/* - * Copyright 2020 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. - */ - package org.typelevel.log4cats.slf4j.internal import scala.annotation.{nowarn, tailrec} 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 a60f2f42..ce7b838a 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/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.