release 0.5.2, drop 2.10 support, change license to Apache 2.0

Author: cvogt

LICENSE.txt

@@ -1,25 +1,13 @@
-Simplified BSD License
+Copyright 2016 Jan Christopher Vogt
 
-Copyright (c) 2015, Jan Christopher Vogt
-All rights reserved.
+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
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+ http://www.apache.org/licenses/LICENSE-2.0
 
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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.

project/Build.scala

@@ -9,18 +9,16 @@ object MyBuild extends Build{
  name := projectName,
  scalaVersion := "2.11.8",
  crossScalaVersions := Seq("2.10.6",scalaVersion.value),
- description := "Composable Records and type-indexed Maps for Scala",
+ description := "Faithful extensions of the Scala standard library",
  libraryDependencies ++= Seq(
  "org.scalatest" %% "scalatest" % "3.0.0-RC4" % "test",
- "org.typelevel" %% "macro-compat" % "1.1.0",
- "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
- compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
+ "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
  ),
  scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked"),
  //scalacOptions ++= Seq("-Xprint:patmat", "-Xshow-phases"),
  testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oFD"),
  parallelExecution := false, // <- until TMap thread-safety issues are resolved
- version := "0.5.1",
+ version := "0.5.2",
  organizationName := "Jan Christopher Vogt",
  organization := "org.cvogt",
  scalacOptions in (Compile, doc) <++= (version,sourceDirectory in Compile,name).map((v,src,n) => Seq(
@@ -43,7 +41,7 @@ object MyBuild extends Build{
  publishArtifact in Test := false,
  pomIncludeRepository := { _ => false },
  makePomConfiguration ~= { _.copy(configurations = Some(Seq(Compile, Runtime, Optional))) },
- licenses += ("Two-clause BSD-style license", url("http://github.com/cvogt/"+projectName+"/blob/master/LICENSE.txt")),
+ licenses += ("Apache 2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
  homepage := Some(url("http://github.com/cvogt/"+projectName)),
  startYear := Some(2015),
  pomExtra :=

readme.txt

@@ -40,4 +40,4 @@ src/test/scala/*
 
 Sbt setup:
 
-libraryDependencies += "org.cvogt" %% "scala-extensions" % "0.5.1"
+libraryDependencies += "org.cvogt" %% "scala-extensions" % "0.5.2"

src/main/scala/Defaults.scala

@@ -3,17 +3,15 @@ package org.cvogt.scala
 import scala.reflect.macros.whitebox.Context
 import scala.language.dynamics
 import scala.language.experimental.macros
-import macrocompat.bundle
 
 object Defaults {
  /** returns the given type's default values in an anonymous class instance */
- def apply[T]: Any = macro DefaultsMacros.apply[T]
+ def apply[T]: Any = macro DefaultsMacros.defaults[T]
 }
 
-@bundle
 class DefaultsMacros( val c: Context ) {
  import c.universe._
- def apply[T: c.WeakTypeTag] = {
+ def defaults[T: c.WeakTypeTag] = {
  val T = weakTypeOf[T]
  if ( !isCaseClass( T ) )
  c.error( c.enclosingPosition, s"not a case class: $T" )

src/main/scala/EnumerateSingletons.scala

@@ -1,14 +1,12 @@
 package org.cvogt.scala
 import scala.reflect.macros.blackbox.Context
 import scala.language.experimental.macros
-import macrocompat.bundle
 
 object EnumerateSingletons {
  /** singleton objects transitively extending the given class or trait */
  def apply[A]: Set[A] = macro EnumerateSingletonsMacros.enumerateSingletonsMacros[A]
 }
 
-@bundle
 class EnumerateSingletonsMacros( val c: Context ) {
  import c.universe._
  def enumerateSingletonsMacros[T: c.WeakTypeTag]: Tree = {