Commit Graph

4367 Commits

Author SHA1 Message Date
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 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
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 26e15c2dd4 Add notes for #2258 2015-10-28 16:05:45 +01:00
Martin Duhem 541bd4a6a4 Fix for sbt/sbt#1933
sbt was reporting warning abouts inconsistent versions of dependencies
even if these dependencies didn't have the same configuration (as in
`provided` vs `compile`).

This commit fixes this problem by comparing the dependencies by
organization, artifact name and configuration.

Fixes sbt/sbt#1933
2015-10-28 15:23:45 +01:00
eugene yokota 33478132c5 Merge pull request #2214 from twitter-forks/stuhood/more-thorough-classfile-location-detection
More thorough classfile location detection
2015-09-28 23:17:48 -04:00
Stu Hood 5fbfa7aeb0 Move back to ClassLoader.getSystemClassloader 2015-09-20 09:28:43 -07:00
Stu Hood 9401d47e79 Remove copyright from IOSpecification, and use a simpler Resource lookup. 2015-09-20 08:42:10 -07:00
Stu Hood 198820bc53 Move io tests to subdirectory, and add a test for "System" class lookups. 2015-09-18 17:15:52 -07:00
Stu Hood 5a3b95cd6d Add support for parsing system classes. 2015-09-18 16:37:22 -07:00
eugene yokota d4f7977c42 Merge pull request #2201 from fkorotkov/javac-line-content-fixes
Use getPosition method to get an offset position instead of using a line number
2015-09-10 22:33:52 -04:00
eugene yokota 57321bf6bc Merge pull request #2192 from DavidPerezIngeniero/0.13
More robustness when using the tasks and settings command
2015-09-10 21:14:57 -04:00
fkorotkov cf8d7fbdff Use getPosition method to get an offset position instead of using line number 2015-09-10 16:35:09 -07:00
eugene yokota 5401a77b86 Merge pull request #2197 from Duhemm/fix-2196
Fixes #2196, Specify the compiler bridge module in a setting
2015-09-08 23:23:48 -04:00
Martin Duhem 92ea782d94 Fix deprecation messages 2015-09-04 12:25:59 +02:00
Martin Duhem 152b040fe3 Rename binary form of compiler bridge
This will avoid all clashes between modules that may have the same name
as other components of sbt, or two different compiler bridges that would
happen to have the same name.
2015-09-04 12:23:06 +02:00
Martin Duhem 1c4a900ff5 Retrieve compiler bridge sources in temp directory
Note that they won't be downloaded again, because the component compiler
will look for a previously-compiled version of the compiler bridge
before trying to fetch the sources again. If they've already been
downlaoded, then they have been compiled and a compiled version of the
compiler bridge already exists.
2015-09-04 12:00:44 +02:00
Martin Duhem dcad8a5527 Specify the compiler bridge module in a setting
In order to restore reproducibility of builds, we no longer cascade over
the possibly available versions of the compiler bridge sources (a
specific version of the bridge sources may not be available one day, but
exist on the next day), but rather let the build definition configure
which module to use.

Fixes sbt/sbt#2196
2015-09-04 11:17:27 +02:00
David Perez 1e2617a807 More robustness when using the tasks and settings command 2015-09-01 14:16:41 +02:00
Josh Suereth 58f5ceb6f2 Merge pull request #2186 from dwijnand/fix/1750-2
Tail-end fixes for #1750.
2015-08-31 07:43:24 -04:00
Dale Wijnand 397c25679f Add notes for #1750. 2015-08-28 23:38:49 +01:00
Dale Wijnand 8e6e32d7cb Enable Ivy flag that fixes #1750. 2015-08-28 23:38:45 +01:00
Josh Suereth f6895b6f00 Merge pull request #2163 from dwijnand/fix/1750
Fix SNAPSHOT srcs/docs with Ivy upgrade.
2015-08-27 08:34:09 -04:00
Josh Suereth 6f8eaab026 Merge pull request #2178 from Duhemm/scripted-pending
Run pending tests in scripted, consider their successes as failures
2015-08-27 08:33:40 -04:00
Martin Duhem 2bed67a44d Disable test dependency-management/mvn-local
It is very flaky with Travis.
2015-08-27 09:54:20 +02:00
eugene yokota fc7af22eef Merge pull request #2177 from Duhemm/compiler-interface-logging
Compiler interface sources: Hide Ivy logs & download compiler interface sources in boot directory.
2015-08-26 14:31:25 -04:00
Martin Duhem e31a9ba456 Download compiler interface sources in boot directory 2015-08-26 10:33:11 +02:00
Martin Duhem 41b7208a36 Hide Ivy logs in compiler-interface sources retrieval
Because in most cases there aren't version-specific sources, we expect
the retrieval to fail a number of times before succeeding. This
generates a lot of noise in sbt's log, so the logs will now be shown if
and only all the versions fail.
2015-08-26 09:40:53 +02:00
Dale Wijnand caa0f9c010 Move update-classifiers-snapshot-srcs as it fails with MavenResolverPlugin. 2015-08-25 22:03:12 +01:00
Josh Suereth da8bb5b621 Merge pull request #2151 from dwijnand/add-Def.settings
Extract Def.settings from Project#settings.
2015-08-25 09:52:27 -04:00
Dale Wijnand 09ae28803c Fix SNAPSHOT srcs/docs with Ivy upgrade. 2015-08-25 12:42:03 +01:00
Dale Wijnand 7abe7a95a4 Add updateClassifiers SNAPSHOT srcs test.
Currently fails with:
    [info] java.lang.AssertionError: assertion failed: Bippy should contain def release = 2, contents:
    [info] package t
    [info]
    [info] object Bippy {
    [info]   def release = 1
    [info] }

Also fails with MavenResolverPlugin.. :(
2015-08-25 12:42:01 +01:00
eugene yokota 7bb08fe776 Merge pull request #2172 from dwijnand/add-MavenRepository.localIfFile
Add localIfFile to MavenRepository, & use it.
2015-08-23 17:02:16 -04:00
Dale Wijnand 786dc7fd10 Add notes for MavenRepository.localIfFile. 2015-08-23 17:33:19 +01:00
Dale Wijnand 5662b2ceed Only set LocalIfFileRepo if MavenRepository.localIfFile is set. 2015-08-23 17:25:25 +01:00
Dale Wijnand 0bf7e63887 Add localIfFile to MavenRepository. 2015-08-23 17:24:54 +01:00
Dale Wijnand 9beaf21926 Use string interpolation. 2015-08-20 23:12:17 +01:00
Dale Wijnand dcbbc531ed Add notes for PR 2151. 2015-08-20 18:45:42 +01:00
Dale Wijnand 13c6729507 Extract Def.settings from Project#settings.
This allows for the same functionality that using SettingsDefinition in
Project#settings allows (specifying either bare Setting[_] or a Seq[Setting[_]])
to be available outside of the settings for a project, for instance when
defining a val.

In short, it allows:

    val modelSettings = Def.settings(
      sharedSettings,
      libraryDependencies += foo
    )
2015-08-20 18:45:41 +01:00