diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e06824ef..7b79aed6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,11 +113,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: mkdir -p testing/jvm/target noop/jvm/target target .js/target site/target core/js/target testing/js/target noop/js/target core/jvm/target .jvm/target .native/target slf4j/target project/target + run: mkdir -p testing/jvm/target noop/.jvm/target target .js/target site/target core/js/target testing/js/target noop/.js/target core/jvm/target .jvm/target .native/target slf4j/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: tar cf targets.tar testing/jvm/target noop/jvm/target target .js/target site/target core/js/target testing/js/target noop/js/target core/jvm/target .jvm/target .native/target slf4j/target project/target + run: tar cf targets.tar testing/jvm/target noop/.jvm/target target .js/target site/target core/js/target testing/js/target noop/.js/target core/jvm/target .jvm/target .native/target slf4j/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') diff --git a/build.sbt b/build.sbt index 7d6babd8..414ab08c 100644 --- a/build.sbt +++ b/build.sbt @@ -71,6 +71,7 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform) ) lazy val noop = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Pure) .settings(commonSettings) .dependsOn(core) .settings( diff --git a/noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpFactory.scala b/noop/src/main/scala/org/typelevel/log4cats/noop/NoOpFactory.scala similarity index 100% rename from noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpFactory.scala rename to noop/src/main/scala/org/typelevel/log4cats/noop/NoOpFactory.scala diff --git a/noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala b/noop/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala similarity index 100% rename from noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala rename to noop/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala diff --git a/noop/src/main/scala/org/typelevel/log4cats/noop/package.scala b/noop/src/main/scala/org/typelevel/log4cats/noop/package.scala new file mode 100644 index 00000000..81e85924 --- /dev/null +++ b/noop/src/main/scala/org/typelevel/log4cats/noop/package.scala @@ -0,0 +1,26 @@ +/* + * 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. + * 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 + +import cats.Applicative + +package object noop { + + implicit def loggerFactoryforApplicative[F[_]: Applicative]: LoggerFactory[F] = + NoOpFactory[F] + +}