Switch package and name

davenverse · Jul 10, 2023 · 892ac96 · 892ac96
1 parent d84f7b9
commit 892ac96
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         os: [ubuntu-latest]
         scala: [2.13.11, 3.3.0]
         java: [temurin@8]
-        project: [rootJS, rootJVM]
+        project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -73,6 +73,10 @@ jobs:
         if: matrix.project == 'rootJS'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
 
+      - name: nativeLink
+        if: matrix.project == 'rootNative'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
+
       - name: Test
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
@@ -86,11 +90,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 target .js/target site/target core/.js/target core/.jvm/target .jvm/target .native/target project/target
+        run: mkdir -p target .js/target core/.native/target site/target core/.js/target core/.jvm/target .jvm/target .native/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 target .js/target site/target core/.js/target core/.jvm/target .jvm/target .native/target project/target
+        run: tar cf targets.tar target .js/target core/.native/target site/target core/.js/target core/.jvm/target .jvm/target .native/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -163,6 +167,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (2.13.11, rootNative)
+        uses: actions/download-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative
+
+      - name: Inflate target directories (2.13.11, rootNative)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (3.3.0, rootJS)
         uses: actions/download-artifact@v3
         with:
@@ -183,6 +197,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.3.0, rootNative)
+        uses: actions/download-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative
+
+      - name: Inflate target directories (3.3.0, rootNative)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
         run: echo $PGP_SECRET | base64 -di | gpg --import

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
-# http4s-log4cats - Logging Middlewares for Http4s [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/http4s-log4cats_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/http4s-log4cats_2.13) ![Code of Conduct](https://img.shields.io/badge/Code%20of%20Conduct-Scala-blue.svg)
+# http4s-log4cats-contextlog - Logging Middlewares for Http4s [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/http4s-log4cats-contextlog_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/http4s-log4cats-contextlog_2.13) ![Code of Conduct](https://img.shields.io/badge/Code%20of%20Conduct-Scala-blue.svg)
 
-## [Head on over to the microsite](https://davenverse.github.io/http4s-log4cats)
 
 ## Quick Start
 
@@ -9,6 +8,6 @@ To use http4s-log4cats in an existing SBT project with Scala 2.13 or a later ver
 
 ```scala
 libraryDependencies ++= Seq(
-  "io.chrisdavenport" %% "http4s-log4cats" % "<version>"
+  "io.chrisdavenport" %% "http4s-log4cats-contextlog" % "<version>"
 )
 ```
diff --git a/build.sbt b/build.sbt
@@ -29,14 +29,14 @@ val munitCatsEffectV = "2.0.0-M3"
 
 
 // Projects
-lazy val `http4s-log4cats` = tlCrossRootProject
+lazy val `http4s-log4cats-contextlog` = tlCrossRootProject
   .aggregate(core)
 
-lazy val core = crossProject(JVMPlatform, JSPlatform)
+lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("core"))
   .settings(
-    name := "http4s-log4cats",
+    name := "http4s-log4cats-contextlog",
 
     libraryDependencies ++= Seq(
       "org.typelevel"               %%% "cats-core"                  % catsV,

diff --git a/...rt/http4s/log4cats/ClientMiddleware.scala → ...og4cats/contextlog/ClientMiddleware.scala b/...rt/http4s/log4cats/ClientMiddleware.scala → ...og4cats/contextlog/ClientMiddleware.scala
@@ -1,4 +1,4 @@
-package io.chrisdavenport.http4s.log4cats
+package io.chrisdavenport.http4s.log4cats.contextlog
 
 import org.typelevel.ci.CIString
 import org.http4s._

diff --git a/...tp4s/log4cats/HttpStructuredContext.scala → ...ts/contextlog/HttpStructuredContext.scala b/...tp4s/log4cats/HttpStructuredContext.scala → ...ts/contextlog/HttpStructuredContext.scala
@@ -1,4 +1,4 @@
-package io.chrisdavenport.http4s.log4cats
+package io.chrisdavenport.http4s.log4cats.contextlog
 
 
 import org.http4s._

diff --git a/...rt/http4s/log4cats/ServerMiddleware.scala → ...og4cats/contextlog/ServerMiddleware.scala b/...rt/http4s/log4cats/ServerMiddleware.scala → ...og4cats/contextlog/ServerMiddleware.scala
@@ -1,4 +1,4 @@
-package io.chrisdavenport.http4s.log4cats
+package io.chrisdavenport.http4s.log4cats.contextlog
 
 
 import org.typelevel.ci.CIString

diff --git a/...p4s/log4cats/SharedStructureLogging.scala → ...s/contextlog/SharedStructureLogging.scala b/...p4s/log4cats/SharedStructureLogging.scala → ...s/contextlog/SharedStructureLogging.scala
@@ -1,4 +1,4 @@
-package io.chrisdavenport.http4s.log4cats
+package io.chrisdavenport.http4s.log4cats.contextlog
 
 import cats._
 import cats.syntax.all._

diff --git a/...sdavenport/http4s/log4cats/MainSpec.scala → ...http4s/log4cats/contextlog/MainSpec.scala b/...sdavenport/http4s/log4cats/MainSpec.scala → ...http4s/log4cats/contextlog/MainSpec.scala
@@ -1,4 +1,4 @@
-package io.chrisdavenport.http4s.log4cats
+package io.chrisdavenport.http4s.log4cats.contextlog
 
 import munit.CatsEffectSuite
 import cats.effect._

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,4 +2,6 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.19")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.19")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.4.19")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.2.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.2.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")