Update code to be compatible with scala 2.10 #48

Merged
merged 1 commit into from May 7, 2013

2 participants

@dnadolny

This is mainly a change to the source code of scalagen itself, the largest change being the removal of the - and -- operators from List.

There is also a small change in the generated source, which requires knowledge of whether we are targetting scala 2.9 or 2.10. StaticAnnotation in scala has moved to a package that is not imported by default, so if we're targetting 2.10 we must add an explicit import.

The change to Annotations doesn't need a new test because it is already covered by ScalaCompilationTest (the annotations Config.java and QueryDelegate.java would fail to compile under 2.10 without this change).

@dnadolny dnadolny Update code to be compatible with scala 2.10
This is mainly a change to the source code of scalagen itself, the largest change being the removal of the - and -- operators from List.

There is also a small change in the generated source, which requires knowledge of whether we are targetting scala 2.9 or 2.10. StaticAnnotation in scala has moved to a package that is not imported by default, so if we're targetting 2.10 we must add an explicit import.

The change to Annotations doesn't need a new test because it is already covered by ScalaCompilationTest (the annotations Config.java and QueryDelegate.java would fail to compile under 2.10 without this change).
d1097d7
@dnadolny

By the way, the tests don't completely pass under 2.10, there is a problem with the usage of generics in DateTimeExpression that I haven't looked in to.

@timowest timowest merged commit 2468911 into timowest:master May 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment