Skip to content

Commit 4472a70

Browse files
committed
Incorporate the changes of other two PRs scalamacros#6 and scalamacros#7
1 parent 3ae1d4b commit 4472a70

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

UNLICENCE

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
This is free and unencumbered software released into the public domain.
2+
3+
Anyone is free to copy, modify, publish, use, compile, sell, or
4+
distribute this software, either in source code form or as a compiled
5+
binary, for any purpose, commercial or non-commercial, and by any
6+
means.
7+
8+
In jurisdictions that recognize copyright laws, the author or authors
9+
of this software dedicate any and all copyright interest in the
10+
software to the public domain. We make this dedication for the benefit
11+
of the public at large and to the detriment of our heirs and
12+
successors. We intend this dedication to be an overt act of
13+
relinquishment in perpetuity of all present and future rights to this
14+
software under copyright law.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.
23+
24+
For more information, please refer to <http://unlicense.org/>

build.sbt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
name := "sbt-example"
22
organization := "org.scalamacros"
3-
version := "2.0.1"
3+
version := "2.0.0"
44

5-
ThisBuild / scalaVersion := "2.13.14"
5+
ThisBuild / crossScalaVersions := Seq("2.13.14", "2.12.19", "2.11.12")
6+
ThisBuild / scalaVersion := crossScalaVersions.value.head
67

7-
// this line is not valid in Scala 2.13 due to <<=, migrate according to https://www.scala-sbt.org/0.13/docs/Migrating-from-sbt-012x.html
8-
//run <<= run in Compile in core
8+
run := (core / Compile / run).evaluated
99

10-
// alias is the way to go, now you can do: sbt runMy
11-
addCommandAlias("runMy", "core / Compile / run")
12-
13-
lazy val macros = (project in file("macros")).settings(
10+
lazy val macros = project in file("macros") settings(
1411
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
1512
)
1613

17-
lazy val core = (project in file("core")) dependsOn macros
14+
lazy val core = project in file("core") dependsOn macros

0 commit comments

Comments
 (0)