Merge ece8f44 into d7eb541

combinators · Feb 6, 2020 · db396ef · db396ef
2 parents d7eb541 + ece8f44
commit db396ef
Show file tree

Hide file tree

Showing 18 changed files with 575 additions and 303 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,11 @@
-# Travis secrets
-travis/local.*
 
-# Created by https://www.gitignore.io/api/sbt,vim,java,scala,emacs,ensime,eclipse,intellij+all
+# Created by https://www.gitignore.io/api/sbt,vim,java,scala,emacs,ensime,eclipse,intellij+all,bloop,metals
+# Edit at https://www.gitignore.io/?templates=sbt,vim,java,scala,emacs,ensime,eclipse,intellij+all,bloop,metals
 
-### Eclipse ###
+### Bloop ###
+.bloop/
 
+### Eclipse ###
 .metadata
 bin/
 tmp/
@@ -29,6 +30,9 @@ local.properties
 # CDT-specific (C/C++ Development Tooling)
 .cproject
 
+# CDT- autotools
+.autotools
+
 # Java annotation processor (APT)
 .factorypath
 
@@ -50,18 +54,26 @@ local.properties
 # Code Recommenders
 .recommenders/
 
+# Annotation Processing
+.apt_generated/
+
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies
 .worksheet
 
 ### Eclipse Patch ###
-# Eclipse Core		
+# Eclipse Core
 .project
 
-# JDT-specific (Eclipse Java Development Tools)		
+# JDT-specific (Eclipse Java Development Tools)
 .classpath
 
+# Annotation Processing
+.apt_generated
+
+.sts4-cache/
+
 ### Emacs ###
 # -*- mode: gitignore; -*-
 *~
@@ -105,28 +117,13 @@ flycheck_*.el
 
 # projectiles files
 .projectile
-projectile-bookmarks.eld
 
 # directory configuration
 .dir-locals.el
 
-# saveplace
-places
-
-# url cache
-url/cache/
+# network security
+/network-security.data
 
-# cedet
-ede-projects.el
-
-# smex
-smex-items
-
-# company-statistics
-company-statistics-cache.el
-
-# anaconda-mode
-anaconda-mode/
 
 ### Ensime ###
 # Ensime specific
@@ -135,40 +132,53 @@ anaconda-mode/
 .ensime_lucene/
 
 ### Intellij+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
+# User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# Sensitive or high-churn files:
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
-.idea/**/dataSources.xml
 .idea/**/dataSources.local.xml
 .idea/**/sqlDataSources.xml
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
 
-# Gradle:
+# Gradle
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
 # CMake
-cmake-build-debug/
+cmake-build-*/
 
-# Mongo Explorer plugin:
+# Mongo Explorer plugin
 .idea/**/mongoSettings.xml
 
-## File-based project format:
+# File-based project format
 *.iws
 
-## Plugin-specific files:
-
 # IntelliJ
-/out/
+out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -179,21 +189,34 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 
-# Ruby plugin and RubyMine
-/.rakeTasks
-
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
 ### Intellij+all Patch ###
-# Ignores the whole idea folder
+# Ignores the whole .idea folder and all .iml files
 # See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
 
 .idea/
 
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
 ### Java ###
 # Compiled class file
 *.class
@@ -210,6 +233,7 @@ fabric.properties
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
 *.zip
 *.tar.gz
@@ -218,6 +242,9 @@ fabric.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+### Metals ###
+.metals/
+
 ### SBT ###
 # Simple Build Tool
 # http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
@@ -233,18 +260,32 @@ project/plugins/project/
 .lib/
 
 ### Scala ###
+*.metals
 
 ### Vim ###
-# swap
+# Swap
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
-[._]s[a-v][a-z]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
 [._]sw[a-p]
-# session
+
+# Session
 Session.vim
-# temporary
+Sessionx.vim
+
+# Temporary
 .netrwhist
-# auto-generated tag files
+
+# Auto-generated tag files
 tags
 
-# End of https://www.gitignore.io/api/sbt,vim,java,scala,emacs,ensime,eclipse,intellij+all
+# Persistent undo
+[._]*.un~
+
+# Coc configuration directory
+.vim
+
+# End of https://www.gitignore.io/api/sbt,vim,java,scala,emacs,ensime,eclipse,intellij+all,bloop,metals
+
+project/metals.sbt
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -0,0 +1,2 @@
+version = 2.3.2
+rewrite.rules = [ AvoidInfix, SortImports ]
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,12 @@ script: sbt +test
 
 jobs:
   include:
-    - stage: test
-      jdk: oraclejdk8
     - stage: test
       jdk: openjdk8
+    - stage: test
+      jdk: oraclejdk11
+    - stage: test
+      jdk: openjdk11
       script: sbt clean coverage +test && sbt coverageReport coveralls
     - stage: deploy
       jdk: openjdk8

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
+### Version 0.2.4
+- Release for Scala 2.13.1.
+- CI now tests and deploys with OpenJDK11
+
+### Version 0.2.3
+- eliminates a potential space leak
+
 ### Version 0.2.2
 This version is a maintenence release
  - moves things to org.combinators
  - updates libraries
  - fixes potential wrap arounds due to usage of Int in Finite
 
-### Version 0.2.3
-- eliminates a potential space leak
+
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ The current release is available at maven central, just add
 ```scala
 libraryDependencies += "org.combinators" %% "shapeless-feat" % "VERSIONNUMBER"
 ```
-Currently, Scala 2.11 and 2.12 are supported in the released version.
+Currently, Scala 2.11, 2.12, and 2.13 are supported in the released version.
 
 ## Examples
 Can be found in the [examples project](https://github.com/combinators/shapeless-feat/tree/master/examples/src/main/scala) and the [tests](https://github.com/combinators/shapeless-feat/tree/master/src/test/scala/shapeless/feat).

diff --git a/build.sbt b/build.sbt
@@ -2,60 +2,75 @@ import sbt.{Credentials, Developer, ScmInfo}
 
 lazy val commonSettings = Seq(
   organization := "org.combinators",
-
-  scalaVersion := "2.12.4",
-  crossScalaVersions := Seq("2.11.12", scalaVersion.value),
-
+  scalaVersion := "2.13.1",
+  crossScalaVersions := Seq("2.11.12", "2.12.10", scalaVersion.value),
   resolvers ++= Seq(
     Resolver.sonatypeRepo("releases"),
     Resolver.sonatypeRepo("snapshots")
   ),
-
-  headerLicense := Some(HeaderLicense.ALv2("2018", "Jan Bessai")),
-
+  headerLicense := Some(HeaderLicense.ALv2("2018-2020", "Jan Bessai")),
   scalacOptions ++= Seq(
     "-unchecked",
     "-deprecation",
     "-feature",
     "-language:implicitConversions"
-   ),
-   javaOptions in Test := Seq("-Xss16m"),
-   fork in Test := true
- ) ++ publishSettings
+  ),
+  javaOptions in Test := Seq("-Xss16m"),
+  fork in Test := true,
+  scapegoatVersion in ThisBuild := "1.4.1"
+) ++ publishSettings
 
-lazy val root = Project(id = "shapeless-feat", base = file(".")).
-  settings(commonSettings: _*).
-  settings(
+lazy val root = Project(id = "shapeless-feat", base = file("."))
+  .settings(commonSettings: _*)
+  .settings(
     moduleName := "shapeless-feat",
     libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.3",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % "test",
-    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.13.5" % "test"
-  )
-
-lazy val examples = Project(id = "shapeless-feat-examples", base = file("examples")).
-  settings(commonSettings: _*).
-  settings(noPublishSettings: _*).
-  dependsOn(root).
-  settings(
-    moduleName := "shapeless-feat-examples"
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % "test",
+    libraryDependencies += "org.scalatestplus" %% "scalacheck-1-14" % "3.1.0.1" % "test",
+    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.1" % "test",
+    unmanagedSourceDirectories in Compile += {
+      val sourceDir = (sourceDirectory in Compile).value
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, n)) if n >= 13 => sourceDir / "scala-2.13+"
+        case _                       => sourceDir / "scala-2.12-"
+      }
+    }
   )
 
+lazy val examples =
+  Project(id = "shapeless-feat-examples", base = file("examples"))
+    .settings(commonSettings: _*)
+    .settings(noPublishSettings: _*)
+    .dependsOn(root)
+    .settings(
+      moduleName := "shapeless-feat-examples"
+    )
 
 lazy val publishSettings = Seq(
   homepage := Some(url("https://www.github.com/JanBessai/shapeless-feat")),
-  licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
-  scmInfo := Some(ScmInfo(url("https://github.com/JanBessai/shapeless-feat"), "scm:git:git@github.com:JanBessai/shapeless-feat.git")),
+  licenses := Seq(
+    "Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")
+  ),
+  scmInfo := Some(
+    ScmInfo(
+      url("https://github.com/JanBessai/shapeless-feat"),
+      "scm:git:git@github.com:JanBessai/shapeless-feat.git"
+    )
+  ),
   developers := List(
-    Developer("JanBessai", "Jan Bessai", "jan.bessai@tu-dortmund.de", url("http://janbessai.github.io"))
+    Developer(
+      "JanBessai",
+      "Jan Bessai",
+      "jan.bessai@tu-dortmund.de",
+      url("http://janbessai.github.io")
+    )
   ),
-
   pgpPublicRing := file("travis/local.pubring.asc"),
-  pgpSecretRing := file("travis/local.secring.asc"),
+  pgpSecretRing := file("travis/local.secring.asc")
 )
 
 lazy val noPublishSettings = Seq(
   publish := Seq.empty,
   publishLocal := Seq.empty,
   publishArtifact := false
 )
-