luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,352 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

4352 Commits

Author SHA1 Message Date
Eugene Yokota 076ccd7b90 Merge 2015-09-14 10:54:22 -04:00
eugene yokota 128e9eff41 Merge pull request #2204 from Duhemm/modularize 
Fix all imports
 2015-09-14 10:39:13 -04:00
Martin Duhem c981abd295 Fix all imports 2015-09-14 14:28:09 +02:00
Eugene Yokota 1b55efaf10 remove unused paths 2015-09-14 03:36:36 -04:00
Eugene Yokota 4053ea92ba Remove source that went into the modules 2015-09-14 03:33:39 -04:00
Eugene Yokota 7132491f6c Rewire to new modules 2015-09-14 03:27:22 -04: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
eugene yokota 5a7a1db24b Merge pull request #2166 from dwijnand/upgrade-to-0.13.9 
Upgrade to 0.13.9.
 2015-08-20 11:51:52 -04:00
eugene yokota 3e33ffd5c0 Merge pull request #2152 from dwijnand/revert-travis-workaround 
Revert Travis/sbt-extras workaround. (#2124).
 2015-08-20 11:51:26 -04:00
Martin Duhem 337bca1c74 Disable project / session-save 2015-08-19 16:16:16 +02:00
Dale Wijnand 553dffec39 Upgrade to 0.13.9. 2015-08-19 12:16:03 +01:00
Martin Duhem 29e6764a05 Mark passing pending scripted tests as passing 
The following scripted tests are pending but pass:

 - dependency-management / gh-1484-npe
 - source-dependencies / implicit-search-companion-scope
 - tests / arguments-new

The test dependency-management / publish-local passes but is considered
as flaky, and is thus disabled (see
6424adadcb).
 2015-08-19 11:29:13 +02:00
Martin Duhem d84573c9d3 Include pending scripted tests in * and *aofb 2015-08-19 09:11:02 +02:00
Martin Duhem bce77a1ecc Continue to run tests after passing pending test 2015-08-19 08:26:21 +02:00
eugene yokota 9349094e65 Merge pull request #2158 from twitter-forks/stuhood/fix-error-message-when-name-hashing-is-enabled 
Fix error when name hashing is enabled and mixed with non-enabled
 2015-08-18 17:55:43 -04:00
eugene yokota 296a266add Merge pull request #2154 from dwijnand/update-CONTRIBUTING-for-0.13.9 
Update CONTRIBUTING for 0.13.9.
 2015-08-18 17:55:31 -04:00
Martin Duhem 1b2750be7a Mark passing pending scripted tests as failures 2015-08-18 15:38:36 +02:00
Martin Duhem ca1de3836e Mark test source-dependencies/trait-super as fixed 
It appears to have been fixed by #2160
 2015-08-18 15:17:37 +02:00
eugene yokota 53ef1c5f18 Merge pull request #2160 from Duhemm/fix-2155 
Include private members in API hash of traits.
 2015-08-17 15:05:30 -04:00
Martin Duhem 8a31702253 Add overloads to restore binary compatibility 2015-08-17 16:31:09 +02:00
Martin Duhem 40ebc82531 Include private members in API hash of traits. 
During compilation, scalac generates getters and setters for the fields
of traits, regardless of their access modifiers. Therefore, when a
field of a trait is modified, all its implementors must be recompiled to
take these changes into account.

Private fields of traits were not included in the API hash of traits,
and their implementors were thus not recompiled when modified.

This commit changes the way the API hash is computed for traits only, so
that the generated hash includes the private members of traits.

Fixes sbt/sbt#2155
 2015-08-17 11:59:48 +02:00
Stu Hood 1b6dbc90c1 Fix error message when name hashing is enabled and mixed with non-enabled. 2015-08-15 11:55:31 -07:00