Commit Graph

4406 Commits

Author SHA1 Message Date
Grzegorz Kossakowski d2aeff365b Merge branch 'nameHashing/private-members' of https://github.com/gkossakowski/sbt into nameHashing/private-members 2015-12-23 14:19:09 +01:00
Grzegorz Kossakowski 3a6b6aadc0 Add scripted (functional test) for #2324.
Add a test that shows the scenario described in #2324 is handled correctly
now.
2015-12-23 14:17:47 +01:00
Grzegorz Kossakowski b76db70044 Merge pull request #10 from adriaanm/gkossakowski-nameHashing/private-members
Test & fix for regression in Lazy serialization uncovered by #2325
2015-12-22 19:46:43 +01:00
Adriaan Moors 95da6ec5a6 `AbstractLazy`'s `writeObject` is `protected`
Fix for regression triggered by #2325 -- apparently, the API visitor would
force all the lazy stubs so the `AbstractLazy` `writeReplace` was not exercised.
With the private subtrees being ignored, the visitor didn't force the lazy stub,
and the `writeProtected` method was not inherited in `SafeLazy.Impl`.

From https://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html
`writeReplace` must be protected for its override to be inherited.

> `Serializable` classes that need to designate an alternative object to be used
> when writing an object to the stream should implement this special method with
> the exact signature:
> `ANY-ACCESS-MODIFIER Object writeReplace() throws ObjectStreamException;`
>
> This `writeReplace` method is invoked by serialization if the method exists and
> it would be accessible from a method defined within the class of the object
> being serialized. Thus, the method can have `private`, `protected` and
> `package-private` access.
>
> **Subclass access to this method follows java accessibility rules.**

(Thanks to retronym for digging up the docs.)

The fix is captured, indirectly, by the scripted test
`source-dependencies/java-analysis-serialization-error`.
2015-12-21 22:19:30 -08:00
Adriaan Moors 9a856be5ca Test for regression triggered by #2325
The crash manifested as a `NotSerializableException`,
because we don't visit the private subtrees of the API graph,
which would previously force all Lazy stubs as a side-effect.
There was a backstop in `AbstractLazy` (`writeReplace`), but
somehow that didn't work.

```
java.io.NotSerializableException: sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl
[...]
 at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:329)
 at xsbt.api.SourceFormat$.writes(SourceFormat.scala:24)
 at xsbt.api.SourceFormat$.writes(SourceFormat.scala:15)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:329)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:329)
 at sbt.inc.TextAnalysisFormat21661anonfun at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.javr$.aggregate(TextAnalysisFormat.scala:18)
 at sbt.inc.TextAnalysisFormat$.objToString(TextAnalysisFormat.scala:329)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:213)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:213)
 at sbt.inc.TextAnalysisFormat21661anonfun21661writeMap.apply(TextAnalysisFormat.scala:381)
 at sbt.inc.TextAnalysisFormat21661anonfun21661writeMap.apply(TextAnalysisFormat.scala:377)
 at scala.collection.mutable.ResizableArray.foreach(Resizable at sbt.inc.TextAnalysisFormalection.mutable.ArrayBuffer.foreach(ArrayBuffer.scala:47)
 at sbt.inc.TextAnalysisFormat$.sbt21661writeMap(TextAnalysisFormat.scala:377)
 at sbt.inc.TextAnalysisFormat$.write(TextAnalysisFormat.scala:216)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:64)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:64)
 at sbt.inc.TextAnalysisFormat21661anonfun.apply(TextAnalysisFormat.scala:64)
 at sbt.inc.FormatTimer$.aggregate(TextAnalysisFo at sbt.inc.TextAnalysisFormat21661anonfun.scala:25)
 at sbt.inc.TextAnalysisFormat$.write(TextAnalysisFormat.scala:64)
 at sbt.inc.FileBasedStore21661anon21661anonfun.apply(FileBasedStore.scala:12)
 at sbt.inc.FileBasedStore21661anon21661anonfun.apply(FileBasedStore.scala:12)
 at sbt.Using.apply(Using.scala:24)
 at sbt.inc.FileBasedStore21661anon.set(FileBasedStore.scala:12)
 at sbt.inc.AnalysisStore21661anon.set(AnalysisStore.scala:16)
 at sbt.inc.AnalysisStore21661anon.set(AnalysisStore.scala:27)
 at sbt.Defaults21661anonfun.apply(Defaults.scala:799)
 at sbt.Defaults21661anonfun at sbt.inc.TextAts.scala:793)
 at scala.Function121661anonfun.apply(Function1.scala:47)
 at sbt.21661anonfun21661u2219.apply(TypeFunctions.scala:40)
 at sbt.std.Transform21661anon.work(System.scala:63)
 at sbt.Execute21661anonfun21661anonfun.apply(Execute.scala:226)
 at sbt.Execute21661anonfun21661anonfun.apply(Execute.scala:226)
 at sbt.ErrorHandling$.wideConvert(ErrorHandling.scala:17)
 at sbt.Execute.work(Execute.scala:235)
 at sbt.Execute21661anonfun.apply(Exe at sbt.Using.apply(Using.scala:24)
 mit.apply(Execute.scala:226)
 at sbt.ConcurrentRestrictions21661anon21661anonfun.apply(ConcurrentRestrictions.scala:159)
 at sbt.CompletionService21661anon.call(CompletionService.scala:28)
 at java.util.concurrent.FutureTask.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at java.util.concurrent.Executors.call(Executors.java:439)
 at java.util.concurrent.FutureTask.innerRun(FutureTask.java:303 at sbt.std.Transform21661anon.work(System(FutureTask.java:138)
 at java.util.concurrent.ThreadPoolExecutor.runTask(ThreadPoolExecutor.java:895)
 at java.util.concurrent.ThreadPoolExecutor.run(ThreadPoolExecutor.java:918)
 at java.lang.Thread.run(Thread.java:695)

[error] (compile:compile) java.io.NotSerializableException: sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl
[error] Total time: 2 s, completed Dec 21, 2015 12:05:19 PM
```
2015-12-21 22:19:28 -08:00
Grzegorz Kossakowski bad824c0b1 Do not compute name hashes for private members.
The NameHashing classes assumed that extracted API data structure have
private members filtered out already. That assumption was wrong and
resulted in bug #2324.

We fix the bug by simply reusing the same logic as used by SameAPI class.

Fixes #2324.
2015-12-18 14:32:43 -08:00
Grzegorz Kossakowski 81c0d3daa9 Document ExtractAPI's handling of private members.
Mention that private members are being extracted and included in the api
structures but ignored in many other parts of incremental compiler. I've
made a mistake of assuming that private members are ignored at api
extraction time. This manifested itself as bug #2324.
2015-12-18 14:14:11 -08:00
Grzegorz Kossakowski ae2ddab009 Add pending test for #2324 (name hashes of private members)
Add a pending test that shows a bug in calculation of name hashes.
By design, only non-private members should contribute to name hashes. The
test shows that name hashes are calcuclated for strictly private members
too.
2015-12-18 14:05:00 -08:00
eugene yokota d3cb46951b Merge pull request #2261 from Duhemm/fix-1171
Consider signatures of methods before and after erasure in ExtractAPI
2015-12-16 13:24:42 -05:00
eugene yokota 3e56a7f122 Merge pull request #2315 from sbt/wip/notes2
Release note for 0.13.10
2015-12-16 09:59:43 -05:00
Eugene Yokota 12bdfda224 Artisanal hand merging of release notes 2015-12-15 03:08:40 -05:00
Eugene Yokota d1caf32a86 Adds release note for #2303 2015-12-14 17:19:15 -05:00
eugene yokota 98fbb4381f Merge pull request #2303 from jrudolph/w/2302-disable-pre-and-post-checks
Fixes #2302. Don't check pre and post conditions in sbt.Execute by default
2015-12-14 17:06:13 -05:00
eugene yokota 7645ca5112 Merge pull request #2311 from sbt/wip/scalaversion
Bumping Scala version to 2.10.6.
2015-12-14 14:55:20 -05:00
Eugene Yokota a14112720a Bump up Scala version in project/p.sbt 2015-12-14 11:38:57 -05:00
Eugene Yokota 8d2a15da6e Bumping Scala version to 2.10.6. 2015-12-14 05:26:34 -05:00
Johannes Rudolph 5beb602919 Fixes #2302. Don't check pre and post conditions in sbt.Execute by default.
The checking code has bad run time characteristics and would need to be fixed
for large projects with deep task dependency chains.

The code in sbt.Execute has been in production for a long time so it seems safe
enough to drop the extra checks by default. To debug issues, you can set
`-Dsbt.execute.extrachecks=true` to revert to the old behavior.
2015-12-07 22:14:55 +01:00
Eugene Yokota 4e8d5e827e Merge 2015-12-03 17:08:45 -05:00
eugene yokota 8749a969c3 Merge pull request #2297 from sbt/wip/fix-2264
Fixes #2264. Fixes updateClassifiers when default configuration is missing + uses listed artifacts if any
2015-12-03 02:11:52 -05:00
Eugene Yokota 152e4e3d72 Adds integration test 2015-12-02 19:30:28 -05:00
Eugene Yokota 3a3965b5f5 Fixes #2264. Use explicit artifacts if any, fallback to hardcoded
Even though it's not really used, updateClassifiers constructs
dependency graph based on the result from update.
The direct cause of #2264 came from the fact that the `allModules`
returned from ConfigurationReport did not include dependency
configurations. For example it returned "compile" instead of
"compile->runtime". I've identified that in #2264 and was fixed by
@Duhemm in f49fb33e6d.

Martin identified that the fix still does not address the fact that
updateClassifier hardcodes the classifiers to be tried. This commit
adds the fallback behavior so for Ivy-published modules it will use the
explicit list of artifacts, and for others it will fallback to the
hardcoded list of classifiers.
2015-12-02 16:41:02 -05:00
Martin Duhem 13410ca68e WIP 2015-12-02 16:56:14 +01:00
Martin Duhem 6d7c8fe655 Correct separator for configurations 2015-11-30 22:53:36 +01:00
Martin Duhem f49fb33e6d Combine ConfigurationReport's conf with ModuleReport's confs 2015-11-30 10:03:40 +01:00
eugene yokota c5b7fc1d9c Merge pull request #2272 from Duhemm/fix-1968
Don't pass `-J<flag>` to local java, improve javac's error parsing
2015-11-27 15:37:16 -05:00
eugene yokota 36835d709e Merge pull request #2285 from dwijnand/add-Resolver.bintraySbtRepo
Add Resolver.bintrayIvyRepo
2015-11-25 14:57:49 -05:00
Dale Wijnand f270cd2a5c Add Resolver.bintrayIvyRepo 2015-11-25 09:26:58 +00:00
Martin Duhem 69411c1876 Fix issues with Codacy 2015-11-12 18:50:03 +01:00
Martin Duhem a8d644eb45 Merge branch '0.13' into fix-1968 2015-11-12 09:15:47 +01:00
eugene yokota 222623071a Merge pull request #2271 from Duhemm/fix-2228
Report failed compilation if errors are registered.
2015-11-12 02:14:08 -05:00
Martin Duhem 5934350aa2 Notes for #2261 2015-11-11 14:55:52 +01:00
Martin Duhem a244f4e141 Fix Codacy failure by specifying return type 2015-11-11 14:49:50 +01:00
Martin Duhem 590c4d07ef Notes for sbt/sbt#2272 2015-11-11 14:41:26 +01:00
Martin Duhem d125a36b6c Parse javac non-compile-errors in JavaErrorParser
Upon startup, javac may report errors because (for instance) because it
received incorrect flags. These errors were not correctly parsed by the
JavaErrorParser and were never reported to the user.

This commit fixes this problem by adding a new parsing rule in
JavaErrorParser: errors that start with the prefix "javac:" are now
correctly parsed and reported to the user.

Fixes sbt/sbt#2256
2015-11-11 14:33:30 +01:00
Martin Duhem 7af0fea54e Don't pass `-J<flag>` option to local Java compiler
These options can only be given to a forked Java compiler. If we run a
local java compiler, we filter these options out and emit a warning.

Fixes sbt/sbt#1968
2015-11-11 14:33:16 +01:00
Martin Duhem e19ca7bf85 Notes for sbt/sbt#2271 2015-11-11 14:30:05 +01:00
Martin Duhem 4a4a3ca94e Report failed compilation if errors are registered.
In some cases, the local java compiler may report compilation errors,
but succeed in compiling the source files (for instance, if there are
encoding problems in the source). However, the command line javac will
report a failed compilation on the same input.

To have the local java compiler behave like the forked java compiler, we
now report the compilation as failed if error messages have been
registered during compilation.

Fixes sbt/sbt#2228
2015-11-11 14:21:54 +01:00
Huw Giddens cbeaba0ccd Update per the changes since August. 2015-11-11 21:35:57 +11:00
eugene yokota be9f1cdf95 Merge pull request #2268 from twitter-forks/stuhood/fix-system-inner-classes
Fix support for parsing of classes located in runtime jars
2015-11-10 23:35:18 -05:00
Stu Hood 9fbbaab58e Add a test that we`re able to parse inner classes. 2015-11-10 14:45:04 -08:00
eugene yokota 8603e24dbb Merge pull request #2258 from Duhemm/fix-1933
Fix for sbt/sbt#1933
2015-11-10 15:00:00 -05:00
Martin Duhem f5e7fdd62a Restore source compatibility with Scala 2.8 2015-11-09 16:30:11 +01:00
Martin Duhem bfc27f1179 Make sure AnyVal is involved before checking post erasure 2015-11-07 09:06:26 +01:00
Martin Duhem d41fda6584 Restore source compatibility with Scala 2.8 + cosmetic changes 2015-11-06 13:11:13 +01:00
Martin Duhem 499c5e7228 Correct fix against SO and macros problem 2015-11-06 11:27:40 +01:00
Martin Duhem f1c05cb5eb Fix source compatibility with Scala < 2.10 2015-11-05 09:26:38 +01:00
Martin Duhem 4299ff76aa Quick and dirty fix for SO 2015-11-05 07:39:50 +01:00
Martin Duhem 9764b7f6ef Don't inspect signatures post erasure if macros are involved 2015-11-04 17:45:08 +01:00
Martin Duhem 111511dc6d `afterPostErasure` didn't exist in 2.9 2015-11-04 15:04:59 +01:00
Martin Duhem efff171618 Restore source compatibility with Scala 2.11 2015-11-04 13:35:53 +01:00