Permalink
1 comment
on commit
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Require Java 8 and Scala 2.11
- Slick 3.2 will require Java 8 and Scala 2.11. - Remove all warnings from the build, including ones not directly related to the dependency changes. - Upgrade OSGi test environment (with plenty of follow-on changes in the `osgitests` project) because the old versions were incompatible with Java 8. - Adapt macro usage to the 2.11 API. The only major change is in the `StaticDatabaseConfig` annotation lookup from the enclosing scope. `HList`, `Nat` and `tsql` require whitebox macros. All other macros are converted to blackbox.
- Loading branch information
Showing
with
128 additions
and 125 deletions.
- +1 −1 .travis.yml
- +0 −1 jvmopts.travis
- +8 −10 osgi-tests/src/test/scala/slick/osgi/test/BasicTest.scala
- +12 −8 osgi-tests/src/test/scala/slick/osgi/testutil/SlickOsgiHelper.scala
- +7 −7 project/Build.scala
- +1 −4 slick-hikaricp/src/main/scala/slick/jdbc/hikaricp/HikariCPJdbcDataSource.scala
- +1 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ActionTest.scala
- +1 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcMapperTest.scala
- +3 −2 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/ShouldNotTypecheck.scala
- +17 −17 slick/src/macro/scala/slick/util/MacroSupportInterpolationImpl.scala
- +1 −0 slick/src/main/scala/slick/ast/Node.scala
- +5 −3 slick/src/main/scala/slick/backend/DatabaseComponent.scala
- +6 −8 slick/src/main/scala/slick/backend/DatabaseConfig.scala
- +2 −2 slick/src/main/scala/slick/collection/heterogeneous/HList.scala
- +3 −3 slick/src/main/scala/slick/collection/heterogeneous/Nat.scala
- +2 −0 slick/src/main/scala/slick/compiler/RemoveTakeDrop.scala
- +14 −13 slick/src/main/scala/slick/driver/MySQLDriver.scala
- +30 −30 slick/src/main/scala/slick/jdbc/MacroTreeBuilder.scala
- +4 −4 slick/src/main/scala/slick/jdbc/StaticQuery.scala
- +6 −6 slick/src/main/scala/slick/lifted/MappedTo.scala
- +4 −4 slick/src/main/scala/slick/lifted/Query.scala
Oops, something went wrong.
This comment has been minimized.
20aed4c
@szeiger Just so you slick guys know, HikariCP is basically waiting on you (Slick 3.2) to drop JDK 7 support from the mainline.