Commit Graph

802 Commits

Author SHA1 Message Date
eugene yokota 69385029ed Merge pull request #2914 from eed3si9n/fport/2681
[fport] Fix #2677: Tags.ForkedTestGroup doesn't work
2017-01-14 23:08:44 -05:00
Paul Draper f836ba0c63 Fix #2677: Tags.ForkedTestGroup doesn't work
Move tag to correct task
2017-01-14 21:58:37 -05:00
eugene yokota 355b724bf2 Merge pull request #2915 from eed3si9n/wip/2692
[fport] Fixes #2686 by resetting scalaVersion for updateSbtClassifiers
2017-01-14 09:08:02 -05:00
eugene yokota fd36a20183 Merge pull request #2907 from eed3si9n/topic/logging
Split log output per channel
2017-01-14 08:34:44 -05:00
eugene yokota abaece6c96 Merge pull request #2913 from eed3si9n/fport/2653
[fport] dependsOn can now be used inside a .sbt file for a subproject
2017-01-14 08:19:42 -05:00
Eugene Yokota f3817ad64f Fixes #2686 by resetting scalaVersion for updateSbtClassifiers
Ref #2634

updateSbtClassifiers uses an artificially created dependency graph set
in classifiersModule. The problem is that ivyScala instance is reused
from the outer scope that has the user project's scalaVersion as
demonstrated as follows:

    scala> val is = (ivyScala in updateSbtClassifiers).eval
    is: Option[sbt.IvyScala] =
Some(IvyScala(2.9.3,2.9.3,List(),true,false,true,org.scala-lang))

This change fixes #2686 by redefining ivyScala with scalaVersion and
scalaBinaryVersion scoped to updateSbtClassifiers task. The existing
scripted test was modified to reproduce the bug.
2017-01-14 07:37:32 -05:00
Anatoly Fayngelerin 6dc2cf4210 dependsOn can now be used inside a .sbt file for a subproject 2017-01-14 07:18:10 -05:00
Eugene Yokota 622823fa36 Adds back dependency-management /cached-resolution-configurations
Ref #2573 #2574, #2513, #2435
2017-01-14 05:52:05 -05:00
Eugene Yokota 2b6253cc4a Fix scripted project/extra 2017-01-14 03:00:07 -05:00
Eugene Yokota 8c9dfda089 Split log output per channel
LogManager implementation is modified to use ManagedLogger, which can swap out backing Appenders without re-creating the log instance.

The State was also changed to track `currentCommand: Option[Exec]`. `Exec` knows the origin of the command invocation, and using that we can now send the network-originated events only to the network clients.

Combined together, this implements log splitting between the sbt clients (channels).
2017-01-13 03:00:02 -05:00
Dale Wijnand 7fcfec8b8e
-sbinary/+sjson-new, -datatype/+contraband & upgrades
* start to replace sbinary with sjson-new
* upgrade from sbt/datatype to sbt/contraband
* upgrade and migrate to new sbt modules APIs
2017-01-05 21:59:00 +00:00
Dale Wijnand 50df95953e
Add missing "d" task testing in actions/depends-on 2017-01-05 14:40:39 +00:00
Eugene Yokota 104c5f53b3
Adding sleep in scripted test to make sure timestamp bumps [fport]
Fixes #2546. Ref #958
scripted compiler-project/error-in-invalidated has been failing
frequently on Travis CI. It seems like incremental compiler is not
catching the change in source occasionally for `changes/A2.scala`.

Forward-port of #2565
2017-01-05 14:40:39 +00:00
Dale Wijnand 43821667bf
Upgrade scalariform version 2016-12-11 12:13:11 +00:00
Dale Wijnand 2aa58b43f4 Merge pull request #2771 from dwijnand/dbuild
Workaround #1696 & bump to JDK 1.8
2016-10-11 12:47:57 +01:00
Dale Wijnand 6859070145
Update Scala 2.10 versions to work on JDK 8
Must be at least 2.10.3, but I just went with the last stable release 2.10.6
2016-10-09 12:50:28 -05:00
eugene yokota 87ef5287f6 Merge pull request #2662 from dwijnand/publishTo-TaskKey
[sbt 1.0] Make publishTo & otherResolvers TaskKey's
2016-09-29 01:43:36 -04:00
Eugene Yokota 0321f0cd48
Add extraProjects adn derivedProjects. Fixes #2532
This adds support to generate synthetic subprojects from an auto plugin.

In addition, a method called `projectOrigin` is added to distinguish
Organic, BuildExtra, ProjectExtra, and GenericRoot.

Forward-port of #2717 and #2738
2016-09-29 01:46:17 +01:00
Dale Wijnand befb0925e3
Make publishTo & otherResolvers TaskKey's
Fixes #2059
2016-09-29 01:35:51 +01:00
Eugene Yokota 9529f0c304 Add `-error` etc for log levels with one hyphen 2016-09-15 02:23:37 -04:00
Eugene Yokota 06724d1c4b Rename early command to `early(command)`
Fixes #2734, Ref #1041
e93c4450a1 added a feature called early
command, which uses `--` as a prefix to denote some commands that runs
ahead of session loading. While the feature might be useful especially
for logging, `--` is too useful just for this purpose.
2016-09-15 01:45:50 -04:00
Dale Wijnand 1ba7bb0fb9 Merge pull request #2712 from Duhemm/fport/key-selection-build-level
Forward port #2469 & #2708
2016-09-01 09:23:01 +01:00
Eugene Yokota 01bd4add3c Replace the old operators with Restligeist macros
The old operators `<<=`, `<+=`, and `<++=` are now replaced with
Restligeist macros that will always fail during compile-time but can
display migration guide as the error message.

This would provide better upgrade experience than simply removing the
methods and displaying `<<= is not a member of sbt.TaskKey`.
2016-08-29 23:08:27 -04:00
Eugene Yokota 829ec4dd3a Update Defaults and scripted to := style 2016-08-29 23:02:10 -04:00
eugene yokota 9f21bb451d [sbt 1.0] Remove .value extension method from input tasks (#2710)
* Remove .value from input tasks. Ref #2709

Calling `.value` method on an input task returns `InputTask[A]`, which
is completely unintuitive and often results to a bug.

In most cases `.evaluated` should be called, which returns `A` by
evaluating the task. Just in case `InputTask[A]` is needed,
`toInputTask` method is now provided.

* Fixed test

* Rename toInputTask to inputTaskValue
2016-08-29 21:11:32 +02:00
Martin Duhem cfdbce10da Scripted test for build level keys. 2016-08-26 08:14:28 +02:00
kenji yoshida 0c086a7761 `aggregate` can now be used inside a .sbt file (#2683)
(cherry picked from commit b92e5773f7)
2016-07-27 23:35:16 +09:00
eugene yokota 5abccaedd2 Merge pull request #2673 from dwijnand/leave-update-options-alone
Don't redefine updateOptions to ignore ThisBuild
2016-07-14 22:35:28 -04:00
Dale Wijnand 886d95c0e5 Don't redefine updateOptions to ignore ThisBuild
Fixes #2671
2016-07-12 13:24:14 +01:00
Dale Wijnand deea82542c Remove unused imports 2016-07-12 11:55:10 +01:00
Dale Wijnand 96e086b1a1 AutoPlugin should require JvmPlugin by default
Fixes #2082
2016-07-08 10:57:55 +01:00
Dale Wijnand 0a75db7e63 Cleanup scriptedPluginProj 2016-06-21 13:15:10 +01:00
Dale Wijnand 2c02285778 Update scripted tests 2016-06-21 00:14:01 +01:00
Miles Sabin 1e9bb93285 Override scala organization and version transitively at the Ivy level 2016-06-05 09:46:00 +01:00
James Roper e21c871d71 Replaced cross building support with sbt-doge 2016-05-17 09:49:16 +10:00
Eugene Yokota e0acb6dcf9 Mark dependency-management/url pending
Ref sbt/sbt#2608, sbt/sbt#2609
2016-05-12 12:41:25 -04:00
Eugene Yokota 53b04a2340 Bump up libarydependencies
libarydependencies 0.1.0-M9 was pulling in incorrect dependencies.
2016-05-10 01:00:23 -04:00
eugene yokota bcd3659935 Merge pull request #2594 from eed3si9n/wip/reorg
[sbt 1.0] Refactoring
2016-05-07 22:11:27 -04:00
Eugene Yokota bc90cd2866 Fix dependency-management/cache-update 2016-05-07 17:20:55 -04:00
Eugene Yokota 785270faf0 Start hiding internal types 2016-05-07 16:26:33 -04:00
Eugene Yokota 772e5bc06c Fix tests after moving things to internal 2016-05-06 20:19:18 -04:00
Eugene Yokota ce3926fbed Bring EvaluateConfigurations and DslEntry to internal 2016-05-06 17:32:26 -04:00
Martin Duhem 5e7e64e1c6 Mark test dependency-management/default-artifact as passing 2016-05-06 13:04:17 -04:00
Martin Duhem 49a934ffdb Pending test for sbt/sbt#2431 2016-05-06 13:04:17 -04:00
eugene yokota 6a9ced8eb6 Merge pull request #2589 from eed3si9n/wip/bumptozinc
[sbt 1.0] Bumping up to Zinc 1.0.0-M1
2016-05-06 05:40:58 -04:00
Eugene Yokota 03c3c5cf08 Fixes project/auto-plugins and add pending test for nested
There seems to be an issue with the discovery of auto plugins in an
inner nested class. The error you would get is:

[info] java.lang.ClassNotFoundException: sbttest.Imports.A$
[info] 	at java.net.URLClassLoader$1.run(URLClassLoader.java:202)
[info] 	at java.security.AccessController.doPrivileged(Native Method)
[info] 	at java.net.URLClassLoader.findClass(URLClassLoader.java:190)
[info] 	at java.lang.ClassLoader.loadClass(ClassLoader.java:306)
[info] 	at java.lang.ClassLoader.loadClass(ClassLoader.java:247)
[info] 	at java.lang.Class.forName0(Native Method)
[info] 	at java.lang.Class.forName(Class.java:249)
[info] 	at
sbt.internal.inc.ModuleUtilities$.getObject(ModuleUtilities.scala:16)
[info] 	at
sbt.internal.inc.ModuleUtilities$.getCheckedObject(ModuleUtilities.scala
:22)
[info] 	at
sbt.internal.inc.ModuleUtilities$$anonfun$getCheckedObjects$1.apply(Modu
leUtilities.scala:25)
[info] 	at
sbt.internal.inc.ModuleUtilities$$anonfun$getCheckedObjects$1.apply(Modu
leUtilities.scala:25)
[info] 	at scala.collection.immutable.Stream.map(Stream.scala:418)
[info] 	at
sbt.internal.inc.ModuleUtilities$.getCheckedObjects(ModuleUtilities.scal
a:25)
[info] 	at sbt.PluginDiscovery$.loadModules(PluginDiscovery.scala:138)
[info] 	at
sbt.PluginDiscovery$.binarySourceModules(PluginDiscovery.scala:132)
[info] 	at sbt.PluginDiscovery$.discover$1(PluginDiscovery.scala:36)
[info] 	at sbt.PluginDiscovery$.discoverAll(PluginDiscovery.scala:45)
[info] 	at sbt.internal.Load$.loadPlugins(Load.scala:856)
2016-05-06 01:39:13 -04:00
Eugene Yokota f8ef449789 Fix test quick 2016-05-06 01:30:35 -04:00
Eugene Yokota 18ef703386 Fix test framework tests 2016-05-06 00:34:12 -04:00
Eugene Yokota 28c37d1014 Fixes source-dependencies/transitive-memberRef 2016-05-06 00:12:07 -04:00
Eugene Yokota ee6af2c06d Remove trait-super test from sbt/sbt 2016-05-05 23:59:30 -04:00