luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,996 Commits 29 Branches 309 Tags 67 MiB
Commit Graph

242 Commits

Author SHA1 Message Date
Mark Harrah 81babda6f6 work around URI problems with encoding and resolving. Fixes #725 2013-04-12 12:47:44 -04:00
Mark Harrah 28b12465df fix regex character filter in VersionParts 2013-03-18 09:52:57 -04:00
Josh Suereth f414214d6e Fixes #706 - Binary Compatibility lost in Launcher. 
This checks to see if the new `crossVersionedValue` is actually implemented
by an AppID and delegates to the deprecated `crossVersioned` method if
there are any issues.   This preserves the binary compatibility from
folks using Launcher interface pre-0.13 and post-0.13.
 2013-03-12 13:04:24 -04:00
Mark Harrah 56b85522b7 ivy cache: ignore the original resolver in more places. Fixes #704 2013-03-08 14:23:31 -05:00
Mark Harrah b8c11678d9 launcher: put ivy resolution cache in boot and clear each run, ignore original resolver 2013-03-08 14:23:31 -05:00
Mark Harrah 8c4ebabe19 remove JLine from the launcher 
It is no longer necessary for it to be loaded in a stable class loader
and line reading in the launcher does not require anything more advanced
than java.io.Console.readLine(String).
Scala versions 2.8 and later use the version that goes through JAnsi
and for that it is sufficient to have JNA in a stable loader.
 2013-02-26 09:27:56 -05:00
Alex Dupre 92e99cfef0 Switch from JLine 1.0 to 2.10. 2013-02-26 07:39:33 -05:00
Mark Harrah 5b5577a187 Replace Scala jars in UpdateReport with ScalaProvider jars in more situations. Fixes #661. 
Specifically, when the Scala version for sbt is the same as that for the project being built,
the jars in UpdateReport should be the same as those in ScalaProvider.  This is because the
loader will come from the ScalaProvider, which uses jars in the boot directory instead of the
cache.  The first part of the fix for #661 checks that loaded classes come from the classpath
and so they need to line up.
 2013-02-21 20:44:26 -05:00
Mark Harrah c815f57a79 Workaround for os deadlock detection at the process level. Fixes #650. 2013-02-05 10:27:19 -05:00
Mark Harrah 437c805f3d Fix ScalaProviderTest to work with new CrossValue type 2013-01-29 17:47:29 -05:00
Eugene Yokota 125727ba83 support binary version in launcher 2013-01-29 16:55:13 -05:00
Mark Harrah 824000009d Right precedence of sbt.boot.properties lookup, handle qualifier correctly. Fixes #651. 2013-01-23 12:48:54 -05:00
Paolo G. Giarrusso 236143be8d Silence boring Eclipse warnings: catching all exceptions 
Here I make explicit where catching all exceptions is intended.
Mark Harrah corrected one decision during review.
 2013-01-22 09:05:15 -05:00
Mark Harrah 1d18532bf0 mark Typesafe repositories as bootOnly, remove Sonatype snapshots now that Scala is resolved by the project 2012-12-09 20:40:41 -05:00
Grzegorz Kossakowski ef39aeb9c1 Follow source layout convention supported by Eclipse. 
Moved source files so directory structure follow package
structure. That makes it possible to use Scala Eclipse plugin
with sbt's source code.
 2012-12-07 10:27:08 -08:00
Mark Harrah b7084ffa1f fix scoping issue in launcher tests 2012-12-04 21:08:38 -05:00
Josh Suereth 4210936163 Adding app-repositories feature to Launcher. 
* Added appRepositories method to Launcher interface
* Added 'bootOnly' configuration, such that repositories can be used only for boot and not applications.
* Added tests to ensure 'bootOnly' and 'mavenCompatible' behave well
* Updated documentation on launcher to reflect new options.
 2012-12-04 13:10:10 -05:00
Josh Suereth e07dc32b7e Adding some documentation to Launcher interface. 
* Documented most of the heavily used methods in Launcher.
* Need to decide whether or not getScala is 'deprecated' or just disuaded in the future.
 2012-12-04 13:10:10 -05:00
Josh Suereth 0c08c1169e Bumped the Scalatest/Specs versions for 2.10.0-RC3 
* Modified tests to use mutable Specs API
* Fixed a few minor specs issues.
 2012-12-04 13:10:09 -05:00
Mark Harrah 8d6dd10798 2.10.0-M5, different arity generalization 
1. KList[M[_]] now instead of KList[HL <: HList, M[_]]
  a. head, tail work properly in this variant
  b. disadvantage is that full type not easily transformed to new type constructor
2. AList abstracts on K[L[x]], a higher order type constructor.
 A. Instances written for:
  a. KList
  b. Seq[M[T]] for a fixed T
  c. TupleN
  d. single values
  e. operate on one type constructor when nested
 B. Main disadvantage is type inference.  It just doesn't happen for K[L[x]].
    This is mitigated by AList being used internally and rarely needing to construct a K.
 2012-11-17 20:19:24 -05:00
Mark Harrah 1c1e5c4977 taking care of deprecations removed in Scala master 2012-11-14 11:48:06 -05:00
Eric Bowman 835ee0d1b3 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 113fdbaff1 fix launcher tests 2012-07-01 15:16:41 -04:00
Mark Harrah d8f5c39465 remove most occurrences of ScalaObject 2012-07-01 15:16:41 -04:00
Mark Harrah c9310db337 resolve Ivy home launcher setting to absolute path 2012-06-22 22:11:25 -04:00
Mark Harrah d9a8ec0c22 system property name: resolver->repository 2012-06-02 19:03:57 -04:00
Josh Suereth 76d24091fa Fixes from mark's suggestions. 
* Puppies may rest easy from the removal of Option.get calls.
* better names for config values
* Added a helper method to avoid any possible code duplication, besides repeated def, val, match and for keywords.
  Looking for ways to remove this duplciation ASAP.
* Moved from pattern match to ._1, my most hated member.
 2012-05-30 21:42:45 -04:00
Josh Suereth 8bca690e0a User may now override default resolvers with a config file. * Configuration parsing now looks for a ivy.resolver-config property for alternative resolver config. * ivy.resolver-config defaults to ~/.sbt/repositories * If the resolve config file exists, its [resolvers] section is used instead of sbt-launch.jar's * Attempted to re-use as much code as possible and add as little as needed. 2012-05-30 21:42:45 -04:00
Josh Suereth 52307d27a4 Adding ability to override resolvers from launcher. * Added key which pulls the repositories used by the launcher, if the API allows. * Added which configures whether or not should just use . * Added parsing to launcher so java property is used by default for override setting. 2012-05-30 21:42:45 -04:00
Mark Harrah ba13aec159 extra launcher properties paths for missing and unmatched sbt.version 2012-05-27 20:03:08 -04:00
Mark Harrah 1488bf2eff restore scala-tools-* repository names in launcher as aliases to sonatype-oss-* 2012-05-27 20:03:08 -04:00
Mark Harrah f39af0bab3 a more universal launcher 
when a properties file is not otherwise explicitly specified,
the sbt.version from project/build.properties is used to select
the default properties file to use.  This launcher should be able
to launch:

 0.7.x
 0.10.{0,1}
 0.11.{0,1,2,3}
 0.12.x

Note that it can only launch the release versions of 0.10 and 0.11
listed above and in particular cannot launch snapshot versions.  All
0.12.x versions and 0.7.x versions should be supported, although only
0.7.7 was tested.
 2012-05-24 21:50:25 -04:00
Mark Harrah e8b8be7547 more scala-tools replacements 2012-05-05 20:35:04 -04:00
Mark Harrah fa725ef9c9 replace scala-tools-snapshots with sonatype oss 2012-04-14 19:13:24 -04:00
Mark Harrah 13d3e7dde3 update to Scala 2.9.2 2012-04-13 17:47:12 -04:00
Mark Harrah 2a84a80d5b clean up scalaOrg changes 2012-04-12 17:31:28 -04:00
Vojin Jovanovic 079a2c1bda Minimizing effects of scalaOrganization key addition. 2012-04-11 12:55:01 +02:00
Vojin Jovanovic cbb8caef0c Backwards compatibility check for getScala method. 
Added groupId dependant baseDirectoryName.
General code cleanup.
 2012-04-11 04:04:21 +02:00
Vojin Jovanovic 0f6a50daee Addressing https://github.com/harrah/xsbt/pull/418 
Changed the order of parameters in getScala method.
Changed the key name to scalaOrganization (scala-organization).
Augmented description of the key.
Minor fixes.
 2012-04-05 12:19:49 +02:00
Vojin Jovanovic 182b7c655f Adding `scalaOrg` setting key for scala clones. 
Adding scalaOrg key that specifies organization (artifactId) of scala used in the project. The change does not affect version checks for dependecies and LauncherConfiguration.

Modified scalaProvider cache in Launcher to use (scalaOrg, version) as a key.

Downloaded jars are stored in the folder scala-.../lig-<scalaOrg> if scalaOrg is not default.

scala-org is an advanced setting so it can not be used in build.sbt.
 2012-04-04 19:06:55 +02:00
Stefan Zeiger 602e5e2f27 Make the launcher initialize Jansi if it's found on the path 2012-04-02 21:21:11 +05:30
Mark Harrah 111dfba6a3 support setting sbt.version from system property, which overrides setting in a properties file 
fixes #354
 2012-02-07 21:52:37 -05:00
Mark Harrah 5bdd55b751 keep scala-tools.org snapshots around a little longer 2012-02-04 21:10:30 -05:00
Mark Harrah dd4efec03c auto detect Scala version for non-cross-versioned launcher app 2012-02-04 21:10:30 -05:00
Mark Harrah 7b31db4171 no cross versioning for sbt 2012-02-04 21:10:30 -05:00
Mark Harrah 651d858676 substitute variables in explicit version strings 2012-02-04 21:10:30 -05:00
Mark Harrah 8b06887753 back end side of auto Scala version detection in launcher 2012-02-04 21:10:30 -05:00
Mark Harrah c7b73dc938 substitute variables in custom repository definitions 2012-01-31 07:01:08 -05:00
Mark Harrah 2255bd5a62 org.scala-tools.sbt -> org.scala-sbt and dropping scala-tools.org from defaults 2012-01-22 22:06:52 -05:00
Michael Allman 26fe2594bc Remove superfluous call to exit() in main() 2011-11-28 23:23:14 -08:00
Michael Allman c0b4764683 Print the launcher version and exit if it's passed exactly one argument named "--version" 2011-11-26 16:30:38 -08:00
Mark Harrah b16d4a36ad Remove local Maven repository from launcher's list of repositories 
This is motivated by the high likelihood that it is causing the
 various problems some users have with the launcher not finding
 some dependencies. ref #217.
 2011-11-09 18:30:35 -05:00
Mark Harrah 8e9e4b22cd checksums configurable in [ivy] section. fixes #235 2011-11-04 13:40:59 -04:00
Mark Harrah bb84e32291 fixes #226. allow launched applications to signal the launcher's job is complete by returning Continue 2011-10-14 19:53:01 -04:00
Mark Harrah 2c9e943daa require module descriptor in launcher 2011-10-14 07:52:10 -04:00
Mark Harrah dcfdbe94b4 launcher: retrieve artifacts with 'bundle' type 2011-10-14 07:52:10 -04:00
Aaron D. Valade 96e5a7957c added parsing of a credentials file to add Ivy Credentials to the keyring 
If the user sets the _sbt.boot.credentials_ system property or the
_SBT_CREDENTIALS_ environment variable, then that file gets parsed for a
realm, hostname, username and password which is added to the
CredentialsStore static instance.
 2011-09-21 15:57:42 +08:00
Mark Harrah 02f666ec0e miscellaneous fixes 2011-08-31 20:59:40 -04:00
Mark Harrah a2fe069fb0 default to shared boot directory 2011-08-31 08:25:11 -04:00
Mark Harrah 112f58db28 fix ScalaProviderTest 2011-08-14 10:53:37 -04:00
Mark Harrah 67db9cc743 expose launcher repositories 2011-07-19 21:29:05 -04:00
Mark Harrah 5f8a73cc21 extra component for supporting dynamic changes to sbt's classpath. fixes #83 2011-07-01 23:38:03 -04:00
Mark Harrah eb6a59bdd3 move locks test back to a normal unit test 2011-06-27 22:29:48 -04:00
Mark Harrah c7885ce1ff build work 2011-06-26 12:27:07 -04:00
Mark Harrah 9f4778a2a0 try to work around internal FileChannel NPE 2011-06-26 12:27:06 -04:00
Mark Harrah 1a4646b7f5 move locks test to scripted tests 2011-06-26 12:27:06 -04:00
Mark Harrah 9878d9b3ff allow specifying artifact/ivy patterns in [repositories] separately 2011-06-25 09:37:26 -04:00
Mark Harrah 4f2490d124 launcher: don't retrieve artifacts with classifiers 2011-06-11 20:09:15 -04:00
Mark Harrah fdbeb7742b exclude JUnit from Scala dependencies 2011-06-11 20:09:15 -04:00
Mark Harrah 13adcfb28c fix some tests 2011-06-10 08:08:51 -04:00
Mark Harrah 6cebff588b use class loader argument instead of loader of current class 2011-06-10 07:48:53 -04:00
e.e d3si9n 79de239ce8 fix path resolution on Windows 2011-06-05 22:31:50 -04:00
Mark Harrah b7c20a1149 bump versions 2011-06-03 00:43:40 -04:00
Mark Harrah f38f599157 0.10.0 2011-06-02 23:32:48 -04:00
Mark Harrah fa62e889da bump versions 2011-06-01 03:04:58 -04:00
Mark Harrah ed5bb1a2d4 0.9.10 2011-06-01 02:37:05 -04:00
Mark Harrah f786060883 Revert to using 2.8.1 2011-05-30 17:49:39 -04:00
Mark Harrah 349b510c93 bump versions 2011-05-29 19:17:31 -04:00
Mark Harrah 9002720933 move to 2.9.0-1, bump to 0.9.9 2011-05-29 00:22:08 -04:00
Mark Harrah 04a3f090f6 version bump 2011-05-23 22:39:20 -04:00
Mark Harrah 41162b2484 0.9.8 2011-05-23 22:38:53 -04:00
Mark Harrah 4509428af9 locking of boot directory can be disabled by with [boot].lock: true in boot.properties 2011-05-19 22:04:05 -04:00
Mark Harrah c534b8c289 bump version 2011-05-17 21:07:55 -04:00
Mark Harrah 63acaca0a6 0.9.7 2011-05-17 20:46:58 -04:00
Mark Harrah 3280eed015 properly escape substituted variables for use with Matcher 2011-05-17 12:19:08 -04:00
Mark Harrah c427c3e503 use shorter name for repository 2011-05-16 22:56:07 -04:00
Mark Harrah aa0824584c version bumps 2011-05-12 22:46:49 -04:00
Mark Harrah ffc3d9b496 0.9.6 2011-05-12 22:45:59 -04:00
Mark Harrah 3acac34b97 bump versions 2011-05-12 09:27:29 -04:00
Mark Harrah 081f296d55 0.9.5 2011-05-12 09:26:40 -04:00
Mark Harrah 5232d0db74 fix optional configuration for scala-library 2011-05-12 09:26:15 -04:00
Mark Harrah d35d76d204 version bumps 2011-04-23 19:29:58 -04:00
Mark Harrah 6db4650035 0.9.4 2011-04-23 19:29:50 -04:00
Mark Harrah 818f14a9a6 launcher applies initial -Dkey=val arguments as settings for convenience 2011-04-19 17:54:29 -04:00
Mark Harrah 6d36b3902f trying a command line configurable default boot.properties 2011-04-18 22:49:52 -04:00
Mark Harrah 14618dc21e system property substitution in launch configuration IDs 2011-04-18 22:49:35 -04:00
Mark Harrah 83f50f42c4 substitute system properties in paths in launcher 2011-04-18 22:17:55 -04:00
Mark Harrah 4328d7d1f1 Hack to avoid Ivy checking for sources/javadocs for every module 2011-04-15 18:31:16 -04:00
Mark Harrah 3e29126cbf support checksum generation and checking, enable by default 2011-04-15 18:25:54 -04:00
Mark Harrah fe75bade98 continuations test for compiler plugin support 2011-04-12 22:58:32 -04:00