Commit Graph

4462 Commits

Author SHA1 Message Date
eugene yokota ea87fdf105 Merge pull request #2386 from dwijnand/enable-mavenResolverPlugin-scripted
Enable mavenResolverPlugin scripted w/ new sbt/librarymanagement
2016-02-26 23:39:18 -05:00
eugene yokota f0fa4d329e Merge pull request #2486 from eed3si9n/fport/2355
FPORT: Adds more memory to internal scripted task
2016-02-26 18:15:06 -05:00
Dale Wijnand dc6d7ea28f Enable mavenResolverPlugin scripted w/ new sbt/librarymanagement
Fixes #2385
2016-02-26 23:05:07 +00:00
Eugene Yokota ff7ac294e7 Adds more memory to internal scripted task 2016-02-26 17:58:35 -05:00
eugene yokota bdded0898d Merge pull request #2393 from dwijnand/fport/make-sbt-dotty-aware
FPORT: Make sbt aware of Dotty
2016-02-26 17:29:27 -05:00
eugene yokota 4da7486dd8 Merge pull request #2481 from eed3si9n/fport/2467
FPORT: Make JCenter opt in and Actually reorganize appResolvers
2016-02-26 17:02:03 -05:00
Eugene Yokota 5a0df33293 Adds test for #2466 per review 2016-02-25 23:09:37 -05:00
Eugene Yokota b1b7430d9c Fixes #2464. Actually reorganize appResolvers
Fixes #2464 and Fixes #2465
appResolvers is a set of resolvers specified in the launcher
configuration.
This list fluctuates depending on the version of sbt, and sbt 0.13.10
meant to stabilize it by weeding out JCenter even when it includes it,
which failed when I applied the filter on the wrong list. This should
correct it.
2016-02-25 23:09:18 -05:00
Eugene Yokota f41d53e20f Minor fix from merging 2016-02-25 23:07:39 -05:00
Eugene Yokota cd373c99ad Add useJCenter setting, which is set to false. Fixes #2217
Adds a new setting `useJCenter`, which is set to `false` by default.
When set to `true`, JCenter will be placed as the first external
resolver to find library dependencies.

The implementation of `externalResolvers` is changed to incorporate the
setting by calling `Resolver.reorganizeAppResolvers`. These changes
were required because `externalResolvers` uses whatever that's in the
launchconfig, which the build user may not upgrade.
2016-02-25 23:02:16 -05:00
Eugene Yokota 31e07492c7 Add JCenter change to 0.13.9's notes 2016-02-25 23:02:16 -05:00
Eugene Yokota dda803085e Merge 2016-02-25 23:00:57 -05:00
eugene yokota e54475690c Merge pull request #2478 from Duhemm/wip/update-incrementalcompiler
Forward port "Handle source, docs artifacts correctly for Ivy [1.0.x]" + update modules
2016-02-25 08:36:19 -05:00
Martin Duhem 5e16bbacca Mark scripted `dependency-management/pom-type` as pending
It has changed and will be re-enabled by changes that have not yet been
forward-ported from sbt 0.13.
2016-02-25 07:14:20 +01:00
Martin Duhem 33a7f6395a Adapt scripted tests to recent API changes 2016-02-24 21:32:48 +01:00
Martin Duhem bf12a2b9c6 Update incrementalcompiler to 0.1.0-M3 2016-02-24 19:49:09 +01:00
Dale Wijnand a6aca312bb Merge pull request #2479 from Duhemm/wip/run-other-unit-tests
Run tests in `otherUnitTests` task
2016-02-24 17:49:03 +00:00
Martin Duhem 20d0c41473 Update to latest util, incrementalcompiler and librarymanagement 2016-02-24 16:54:03 +01:00
Martin Duhem e0dc556dcf Run tests in `otherUnitTests` task 2016-02-24 16:02:22 +01:00
eugene yokota 6583779bb7 Merge pull request #2455 from Duhemm/fport/nameHashing-trait-regression
FPORT: Add a pending test for a modified member of a trait
2016-02-23 14:26:05 -05:00
Grzegorz Kossakowski 0f5f818c73 Move `trait-member-modified` to source-dependencies
It's not clear what the distinction between compiler-project and
source-dependencies scripted tests is so let's stick to the one that has
the biggest number of tests for incremental compiler.
2016-02-23 15:44:12 +01:00
Grzegorz Kossakowski 07ff2d8e26 Add a pending test for a modified member of a trait
The test shows that name hashing optimization is broken for members
defined in traits. The problem is that modification of a member of a trait
triggers change of a hash of trait's name.

The behavior covered by this test regressed in
40ebc82531
The bug is tracked in #2436.
2016-02-23 15:44:12 +01:00
Dan Sanduleac abb53d4cb2 Fix for weird bug where sbt.librarymanagement's package object somehow conflicts with sbt.Keys.. Thanks Scala 2016-02-23 12:02:11 +00:00
Dan Sanduleac 1d8ec0430d Depend on custom librarymanagement 0.1.0 which contains the sourcesDocs changes. 2016-02-23 12:02:11 +00:00
eugene yokota 3c839ff3d3 Merge pull request #2463 from dwijnand/add-issue-and-pr-templates
Add issue & pr templates
2016-02-19 11:04:45 -05:00
Dale Wijnand f20e12edf2 Add "Clean history" to contributing with links 2016-02-19 13:21:11 +00:00
Dale Wijnand 855d2b65de Trim the templates 2016-02-18 16:44:20 +00:00
Dale Wijnand d19b59cc78 Add issue & pr templates 2016-02-17 23:09:36 +00:00
Dan Sanduleac 978f2304e5 Stop deducing confs from classifier when delivering 2016-02-09 15:13:10 +00:00
Dan Sanduleac 63d657e9c0 [1/2] Add {source,doc}ArtifactTypes settings, use them in update* tasks in conjunction with ArtifactTypeFilter 2016-02-09 15:13:10 +00:00
Dan Sanduleac f11755e181 ModuleID + inclusions 2016-02-09 11:48:12 +00:00
Dan Sanduleac 7d2054f3ae ExclusionRule -> InclExclRule 2016-02-09 11:46:16 +00:00
Dan Sanduleac 42ad2fcf05 Get rid of sources/docs configurations 2016-02-09 11:37:52 +00:00
Dale Wijnand 91093b32dd Merge pull request #2403 from timcharper/1.0.x
Forward port pull request #2399 to 1.0.x
2016-01-19 06:41:17 +00:00
Tim Harper 2eda2ebd46 bugfix - apply autoImports for global plugins at global configuration stage
Previously, the autoimports for globally defined plugins were not
imported for global configuration files, although they were imported for
project configuration files.

This patch causes an additional plugin discovery phase to happen during
global config evaluation, so that auto-plugins can be detected and their
imports subsequently included.
2016-01-18 21:43:32 -07:00
Tim Harper 96eadfc3dd add notes on running tests 2016-01-18 21:42:06 -07:00
Tim Harper bbccbc83d3 Amend contributing build instructions to help solve potential build problems 2016-01-18 21:41:49 -07:00
Dale Wijnand fa7776215b Merge pull request #2387 from dwijnand/update-1.0.x-readme
Update README with 1.0.x
2016-01-17 23:47:15 +00:00
Dale Wijnand 1c103d5eef Merge pull request #2396 from dwijnand/fport/rename-travis-matrix-var
Make the intent of the env variable clearer in travis configuration.
2016-01-17 23:20:33 +00:00
Dale Wijnand 3649f5ba70 Update README with 1.0.x 2016-01-17 21:28:32 +00:00
Dale Wijnand fc9b59b8a4 Merge pull request #2392 from dwijnand/fport/drop-scala-override-in-some-scripted-tests
FPORT: Upgrade Scala version in scripted tests
2016-01-17 21:25:22 +00:00
Grzegorz Kossakowski 8f8740d309 Make the intent of the env variable clearer in travis configuration.
Cherry-pick from e738bc3f73.
2016-01-17 21:21:23 +00:00
Guillaume Martres a05218f5ac Make sbt aware of Dotty
This small set of changes, together with the compiler-bridge I wrote
(https://github.com/smarter/dotty-bridge) enables us to compile code
using Dotty in sbt, see https://github.com/smarter/dotty-example-project
for an example.

Partial forward port of #2344.
2016-01-17 16:37:22 +00:00
Grzegorz Kossakowski f34085e31e Upgrade Scala version in scripted tests
Both continuations and macro-config set scalaVersion explicitly but since
sbt relies now on Scala 2.10 it's not needed anymore. In particular, we
can upgrade continuations to 2.10 which makes it easier to work with Java
8.
2016-01-17 16:27:54 +00:00
Dale Wijnand e80029a868 Merge pull request #2373 from dwijnand/fport/scala-version
FPORT: Bumping Scala version to 2.10.6.
2016-01-17 15:26:32 +00:00
Eugene Yokota e31d8a7a0c FPORT: Bumping Scala version to 2.10.6.
Forward-port of #2311.
2016-01-17 02:38:40 +00:00
Dale Wijnand 706b7b9d37 Merge pull request #2381 from dwijnand/1.0/add-sbt-mima
Add sbt-mima. Fixes #2037.
2016-01-17 02:37:20 +00:00
Dale Wijnand 0429fc82b0 Add sbt-mima. Fixes #2037. 2016-01-16 23:12:17 +00:00
eugene yokota ad59b31c35 Merge pull request #2380 from dwijnand/fport/add-sbt-ivy-snapshots-to-launchconfig
FPORT: Include sbt-ivy-snapshots to launchconfig
2016-01-16 14:54:51 -05:00
eugene yokota ae2c5f1d12 Merge pull request #2379 from dwijnand/fport/release-notes-for-name-hashing-private-members
FPORT: Release notes for name hashing private members fix
2016-01-16 14:54:39 -05:00