Merge branch 'master' into fork/an-tex/master

Author: dwickern

.github/workflows/build.yml

@@ -13,20 +13,16 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Set up JDK 1.8
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
  with:
- java-version: 1.8
+ distribution: temurin
+ java-version: 8
+ cache: sbt
 
- - name: Cache SBT
- uses: actions/cache@v2
- with:
- path: |
- ~/.ivy2/cache
- ~/.sbt
- key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt', '**/plugins.sbt') }}
+ - uses: sbt/setup-sbt@v1
 
  - name: Run tests
  run: sbt test mdoc

.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: Release
+on:
+ push:
+ branches: [master, main]
+ tags: ["*"]
+jobs:
+ publish:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: 8
+ cache: sbt
+ - uses: sbt/setup-sbt@v1
+ - run: sbt ci-release
+ env:
+ PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+ PGP_SECRET: ${{ secrets.PGP_SECRET }}
+ SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+ SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.gitignore

@@ -1,2 +1,6 @@
 target/
 .bsp/
+.bloop/
+.idea/
+.metals/
+.vscode/

README.md

@@ -16,7 +16,7 @@ Usage
 
 Add the library as "provided", because it's only needed during compilation and not at runtime:
 ```sbt
-libraryDependencies += "com.github.dwickern" %% "scala-nameof" % "3.0.0" % "provided"
+libraryDependencies += "com.github.dwickern" %% "scala-nameof" % "4.0.0" % "provided"
 ```
 
 And import the package:

build.sbt

@@ -1,17 +1,15 @@
-import ReleaseTransformations._
-
 ThisBuild / organization := "com.github.dwickern"
 
-lazy val scala213 = "2.13.4"
-lazy val scala212 = "2.12.13"
-lazy val scala211 = "2.11.12"
+lazy val scala3 = "3.3.5"
+lazy val scala213 = "2.13.16"
+lazy val scala212 = "2.12.20"
 
 lazy val root = project.in(file("."))
  .aggregate(nameof.projectRefs: _*)
  .enablePlugins(MdocPlugin)
  .settings(
  // for IntelliJ import: pick one project from the matrix to use
- nameof.jvm(scala213).settings,
+ nameof.jvm(scala3).settings,
  target := baseDirectory.value / "target",
  ideSkipProject := false,
  publish / skip := true,
@@ -21,53 +19,34 @@ lazy val root = project.in(file("."))
 lazy val nameof = (projectMatrix in file("."))
  .settings(
  name := "scala-nameof",
- publishTo := sonatypePublishToBundle.value,
- releaseCrossBuild := true,
  ideSkipProject := true,
  libraryDependencies ++= Seq(
- "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
- "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
- "org.scalatest" %%% "scalatest" % "3.2.3" % Test,
- "com.chuusai" %% "shapeless" % "2.3.3" % Test,
+ "org.scalatest" %% "scalatest" % "3.2.19" % Test,
+ "javax.annotation" % "javax.annotation-api" % "1.3.2" % Test,
  ),
  )
- .jsPlatform(scalaVersions = Seq(scala213, scala212, scala211))
- .jvmPlatform(scalaVersions = Seq(scala213, scala212, scala211))
+ .jvmPlatform(scalaVersions = Seq(scala3), Seq(
+ libraryDependencies ++= Seq(
+ "org.typelevel" %% "shapeless3-test" % "3.4.3" % Test,
+ )
+ ))
+ .jvmPlatform(scalaVersions = Seq(scala213, scala212), Seq(
+ libraryDependencies ++= Seq(
+ "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
+ "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
+ "com.chuusai" %% "shapeless" % "2.3.12" % Test,
+ ),
+ ))
 
 Global / excludeLintKeys += ideSkipProject
 
-ThisBuild / pomExtra := {
- <url>https://github.com/dwickern/scala-nameof</url>
- <licenses>
- <license>
- <name>MIT license</name>
- <url>http://www.opensource.org/licenses/mit-license.php</url>
- </license>
- </licenses>
- <scm>
- <connection>scm:git:github.com/dwickern/scala-nameof.git</connection>
- <developerConnection>scm:git:git@github.com:dwickern/scala-nameof.git</developerConnection>
- <url>github.com/dwickern/scala-nameof.git</url>
- </scm>
- <developers>
- <developer>
- <id>dwickern</id>
- <name>Derek Wickern</name>
- <url>https://github.com/dwickern</url>
- </developer>
- </developers>
-}
-
-releaseProcess := Seq[ReleaseStep](
- checkSnapshotDependencies,
- inquireVersions,
- runClean,
- runTest,
- setReleaseVersion,
- commitReleaseVersion,
- tagRelease,
- releaseStepCommandAndRemaining("+publishSigned"),
- releaseStepCommand("sonatypeBundleRelease"),
- setNextVersion,
- commitNextVersion,
+ThisBuild / homepage := Some(url("https://github.com/dwickern/scala-nameof"))
+ThisBuild / licenses := Seq(License.MIT)
+ThisBuild / developers := List(
+ Developer(
+ id = "dwickern",
+ name = "Derek Wickern",
+ email = "dwickern@gmail.com",
+ url = url("https://github.com/dwickern")
+ )
 )

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.4.7
+sbt.version = 1.9.9

project/plugins.sbt

@@ -1,9 +1,6 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.4.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.7.0")
-addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.17" )
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
+addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.4" )

src/main/scala/com/github/dwickern/macros/NameOf.scala renamed to src/main/scala-2/com/github/dwickern/macros/NameOf.scala

@@ -0,0 +1,52 @@
+package com.github.dwickern.macros
+
+import scala.quoted.*
+
+trait NameOf {
+ /**
+ * Obtain an identifier name as a constant string.
+ *
+ * Example usage:
+ * {{{
+ * val amount = 5
+ * nameOf(amount) => "amount"
+ * }}}
+ */
+ transparent inline def nameOf(inline expr: Any): String = ${NameOfImpl.nameOf('expr)}
+
+ /**
+ * Obtain an identifier name as a constant string.
+ *
+ * This overload can be used to access an instance method without having an instance of the type.
+ *
+ * Example usage:
+ * {{{
+ * class Person(val name: String)
+ * nameOf[Person](_.name) => "name"
+ * }}}
+ */
+ transparent inline def nameOf[T](inline expr: T => Any): String = ${NameOfImpl.nameOf('expr)}
+
+ /**
+ * Obtain a type's unqualified name as a constant string.
+ *
+ * Example usage:
+ * {{{
+ * nameOfType[String] => "String"
+ * nameOfType[fully.qualified.ClassName] => "ClassName"
+ * }}}
+ */
+ transparent inline def nameOfType[T]: String = ${NameOfImpl.nameOfType[T]}
+
+ /**
+ * Obtain a type's qualified name as a constant string.
+ *
+ * Example usage:
+ * {{{
+ * nameOfType[String] => "java.lang.String"
+ * nameOfType[fully.qualified.ClassName] => "fully.qualified.ClassName"
+ * }}}
+ */
+ transparent inline def qualifiedNameOfType[T]: String = ${NameOfImpl.qualifiedNameOfType[T]}
+}
+object NameOf extends NameOf