Commit Graph

1240 Commits

Author SHA1 Message Date
Mark Harrah ae67f6f85d ConflictWarning cleanup, added strict convenience method for failing on any conflicts 2012-12-02 03:17:19 -05:00
Mark Harrah 3f091e5f86 Resolve Scala version for projects in the normal `update` task.
1. Scala jars won't be copied to the boot directory, except for those needed to run sbt.
2. Scala SNAPSHOTs behave like normal SNAPSHOTs.  In particular, running `update` will properly re-resolve the dynamic revision.
3. Scala jars are resolved using the same repositories and configuration as other dependencies.
4. Classloaders (currently, Scala classloaders) are cached by the timestamps of entries instead of Scala class loaders being cached by version.

TODO: Support external dependency configuration
2012-11-17 20:23:06 -05:00
Mark Harrah c6a3b352c4 taking care of deprecations removed in Scala master 2012-11-14 11:48:06 -05:00
Mark Harrah f95c45f76e Fixes #582. Don't merge dependencies with mismatched transitive/force/changing values.
This avoids the assertion, but note that Ivy is unlikely to work properly in this situation.
2012-11-12 14:45:36 -05:00
Mark Harrah 14057fb211 cleanup of #585: compatible with earlier launchers 2012-10-29 09:52:10 -04:00
Eric Bowman bc6770bec3 XSBT-5: maven-style ivy repo support in the launcher config
Change-Id: I22c1ff126961d61d92e2e45a5b7eff329d3def90
Reviewed-on: https://gerrit.gilt.com/10950
Reviewed-by: Eric Bowman <ebowman@gilt.com>
Tested-by: Eric Bowman <ebowman@gilt.com>
2012-10-29 09:04:42 -04:00
Mark Harrah 614d9976d6 invalidate cache when metadata deleted from local repository 2012-09-23 15:46:26 -04:00
Mark Harrah a0b5b0e7ac Fail publishing when artifacts to publish do not exist. 2012-09-11 11:37:41 -04:00
Mark Harrah 66ac1dbc9a use context logger instead of initial logger for Resolving messages 2012-09-01 09:56:09 -04:00
Mark Harrah 9a0b59b597 Force update on change to last modified time of artifacts or cached descriptor.
This is part 2 of the fix for #532.  It may also fix issues when working with
multiple local projects via 'publish-local' and binary dependencies.
2012-08-29 11:13:48 -04:00
Mark Harrah 7ed0c85097 Second part of resolution cache work. Fixes #532.
Replaces the standard Ivy resolution cache:
 1. Separate the cached resolved Ivy files from resolution reports,
    making resolution reports easier to find (target/resolution-cache/reports/)
 2. Cache location includes extra attributes so that cross builds of a plugin
    do not overwrite each other.
2012-08-29 11:13:48 -04:00
Mark Harrah 69724c4f87 don't write <scope> section of pom if scope is 'compile' 2012-08-28 11:55:24 -04:00
Mark Harrah d641c72a45 per-project resolution cache that deletes cached files before each update
These are the ivy files, properties, and resolve reports for the project,
not dependencies and their artifacts.
2012-08-28 11:55:24 -04:00
Mark Harrah 152d51465d Merge multiple dependency definitions for the same ID. Fixes #468, #285, #419, #480.
This is only a workaround.  Multiple dependency definitions should be avoided
in general.
2012-08-27 10:49:13 -04:00
Thomas Lockney f0bdadc437 Actually pass in the artifact, rather than just a global match 2012-07-17 15:20:26 -04:00
Mark Harrah af6e99acc2 'orbit' packaging should be handled like a standard jar. fixes #499. ref #463 2012-07-06 10:28:51 -04:00
Mark Harrah e54e411451 hk2-jar packaging should be handled like a standard jar. fixes #463 2012-05-16 07:34:15 -04:00
Mark Harrah 9983f6f19a remove duplicate conflict warnings 2012-05-06 15:11:46 -04:00
Mark Harrah 9141618744 change Scala binary version check to a warning 2012-05-06 14:15:03 -04:00
Mark Harrah db3fd82236 more scala-tools replacements 2012-05-05 20:35:04 -04:00
Mark Harrah 52af295b42 deprecations backported to 0.11.3 2012-05-05 20:35:04 -04:00
Mark Harrah 3d1766a96e bump to Ivy 2.3.0-RC1 2012-05-02 19:56:35 -04:00
Mark Harrah 9fe6049352 update-classifiers fixes: mark modules intransitive and don't exclude sources/docs for scala jars 2012-05-02 19:56:35 -04:00
Mark Harrah 9fe72a546e exclude should apply to any artifact type, not just jars. fixes #436 2012-04-28 18:58:52 -04:00
Mark Harrah 8af21f72fe Merge pull request #433 from vigdorchik/optimize_java_compile
Do not load classes for dependencies since having URLs is enough.
2012-04-19 09:30:05 -07:00
Mark Harrah 0a6e767b0e API for embedding incremental compilation 2012-04-18 08:19:33 -04:00
Mark Harrah ce8f7b677d reorganize compilation modules 2012-04-18 08:08:25 -04:00
Mark Harrah c423afb584 Merge pull request #427 from pvlugter/root-loader
Use system classloader when finding root classloader
2012-04-13 02:59:48 -07:00
Mark Harrah 90465c1883 Merge 'vjovanov/0.12' into 0.12 2012-04-12 17:21:08 -04:00
Mark Harrah c111fc1ae2 configuration via ivysettings.xml: use URI instead of URL and make 'inter-project' resolver available for multi-project builds. ref #416 2012-04-11 22:40:45 -04:00
Mark Harrah 14dd139bb2 Merge pull request #423 from mallman/external_ivy_settings_url
Add support for loading Ivy settings from a URL
2012-04-09 04:43:45 -07:00
Michael Allman 38289ad08a Add support for loading Ivy settings from a URL 2012-04-08 20:22:15 -07:00
Indrajit Raychaudhuri 2999cf8df9 Update Resolver configuration
- deprecate scala-tools resolvers
- rename `typesafeResolver` to `typesafeReleases` for consistency
- add reference for other wel known resolvers, viz., oss.sonatype.org and scalasbt.artifactoryonline.com
- rearrange locations for helper methods
2012-03-12 05:25:12 +05:30
Indrajit Raychaudhuri 89122005cb Have convenient toString for `FileCredentials` 2012-02-28 23:01:17 +05:30
Mark Harrah 9ee02b1ba6 Merge pull request #369 from vigdorchik/Overwrite_setting
Overwrite previous setting if possible.
2012-02-28 07:48:44 -08:00
Indrajit Raychaudhuri 403383d7cf Added support for providing basic SCM info
Sonatype OSS repo (where many libraries are expected to migrate) requires
populating SCM info in additional to what is already provisioned for
populating in SBT.

We now support populating the basic SCM info as thus:
```
// Usual <scm><url/><connection/></scm>
scmInfo := Some(ScmInfo(url("https://github.com/foo/project"), "scm:git:https://github.com/foo/project.git"))

// Also add <developerConnection/>
scmInfo := Some(ScmInfo(url("https://github.com/foo/project"), "scm:git:https://github.com/foo/project.git", Some("dev_connection")))
```
For anything more esoteric than the basic info, there is always `pomPostProcess` :)
2012-02-28 15:30:51 +05:30
Mark Harrah ec955474c4 Declare extra namespace in ModuleDescriptor for parsed plugin poms. Fixes #368. 2012-02-27 18:38:04 -05:00
Mark Harrah ebc0e90690 add ConflictWarning.disable convenience method 2012-02-21 22:47:07 -05:00
Mark Harrah 188522d031 Merge pull request #377 from vigdorchik/classify_test_artifacts
'test-' preffix should be stripped to obtain classifier.
2012-02-21 10:17:53 -08:00
Eugene Vigdorchik 2b3db35d84 test- preffix should be stripped to obtain classifier. 2012-02-21 18:52:50 +04:00
Eugene Vigdorchik 4c26d64373 Merge 2012-02-20 12:30:10 +04:00
Mark Harrah c74b03513f work around 'data has not been loaded' exception when direct dependency overridden by newer version 2012-02-14 21:59:13 -05:00
Mark Harrah 1b168c37e4 support for dependency overrides 2012-02-14 21:59:12 -05:00
Mark Harrah e0a141f8e7 Merge pull request #361 from vigdorchik/add_ivy_force
Mirror ivy \'force\' attribute in sbt.
2012-02-08 06:43:02 -08:00
Eugene Vigdorchik 851864f9f6 Mirror ivy \'force\' attribute in sbt. 2012-02-07 20:14:45 +04:00
Mark Harrah 1a65cb6187 Merge pull request #348 from vigdorchik/wip_keep_project_on_reload
keep project on reload
2012-02-02 06:30:24 -08:00
Eugene Vigdorchik 1a5f04e4d9 Merge branch '0.12' of git://github.com/harrah/xsbt into 0.12 2012-01-31 17:50:17 +04:00
Mark Harrah 4988286997 Merge pull request #342 from vigdorchik/wip_sourcepos_eugenevigdorchik
Wip sourcepos eugenevigdorchik
2012-01-30 14:34:03 -08:00
Mark Harrah 80589d1f5b rework cross versioning to account for prerelease Scala versions 2012-01-22 22:06:53 -05:00
Mark Harrah 45e097e281 org.scala-tools.sbt -> org.scala-sbt and dropping scala-tools.org from defaults 2012-01-22 22:06:52 -05:00