Commit Graph

564 Commits

Author SHA1 Message Date
Dale Wijnand 472d28964a Configure scripted to do less
Particularly doesn't compile, package and publish source and doc jars.
2016-09-01 01:14:14 +01:00
Eugene Yokota 9655f50c55 bumping to zinc 1.0.0-X2 2016-08-30 21:37:20 -04:00
Dale Wijnand c5f59d4406 Check formatting with TravisCI
Fixes #2657
2016-07-18 12:58:30 -04:00
eugene yokota 4b0ccd2dab Merge pull request #2670 from dwijnand/remove-404-resolvers
Remove resolvers to repositories that don't exist
2016-07-18 11:10:18 -04:00
Dale Wijnand b245cf5f58 Remove resolvers to repositories that don't exist
Fixes #2195
2016-07-15 08:16:40 +01:00
Dale Wijnand 84c611af36 Remove unused vals/defs 2016-07-12 14:31:35 +01:00
Dale Wijnand deea82542c Remove unused imports 2016-07-12 11:55:10 +01:00
Dale Wijnand 06797514f8 Merge pull request #2655 from dwijnand/cocodacy
Fix #2611: Codacy issues
2016-07-07 23:46:07 +01:00
Dale Wijnand 32760bed55 Remove some fatal exception catching 2016-07-07 18:21:25 +01:00
Eugene Yokota 83f585a95b bump Zinc up 2016-07-06 22:59:50 -04:00
Eugene Yokota 4195d8aca2 Bumping Zinc to 1.0.0-M5 2016-06-28 14:53:57 +02:00
Eugene Yokota 246ec58e35 Adapting to Zinc changes 2016-06-26 03:55:37 +02:00
Dale Wijnand 836911deab Bump to Java 7 (#2649) 2016-06-21 18:40:24 +02:00
Dale Wijnand 954b74654f Add scalacOptions 2016-06-21 08:09:29 +01:00
Miles Sabin 1e9bb93285 Override scala organization and version transitively at the Ivy level 2016-06-05 09:46:00 +01:00
Eugene Yokota 1998fb921b Bumping to zinc 1.0.0-M3 2016-05-12 12:45:09 -04:00
Eugene Yokota 5f9e6e4aad Don't use test artifacts from other projects
Fixes #2597
2016-05-12 12:45:09 -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 638c290e62 Fix launcher publishing 2016-05-08 16:45:20 -04:00
Eugene Yokota d887d7d824 Fix POM settings 2016-05-08 16:18:23 -04:00
Eugene Yokota 6b012b45fa Bump librarymanagement to 0.1.0-M9. Ref #2500 2016-05-06 13:10:39 -04:00
Eugene Yokota fd7c162ea8 Bumping up dependencies 2016-05-05 14:38:24 -04:00
Martin Duhem c70c9989e5 Upgrade to latest zinc 2016-05-04 16:44:31 +02:00
Martin Duhem 893267785f Update to util 0.1.0-M11 2016-05-04 12:29:01 +02:00
Eugene Yokota 0acf05626a Remove external dependencies 2016-05-02 04:17:22 -04:00
Eugene Yokota ab43ec51d8 Adds a scripted test that tests repo override 2016-05-01 03:31:18 -04:00
Eugene Yokota e3a06b72c0 Use 0.13.11 2016-05-01 03:06:26 -04:00
Eugene Yokota de4fef8a09 Move sbt-maven-resolver out of this repository 2016-04-29 04:08:09 -04:00
Eugene Yokota 3f08158bb6 Bump Scala version to 2.11.8 2016-04-29 04:00:50 -04:00
Eugene Yokota a20da88a45 Reduce parameters from sbt.Project.apply 2016-04-25 04:26:30 -04:00
Eugene Yokota 63ff359aca Implements scriptedBufferLog on sbt build 2016-03-30 23:48:20 -04:00
eugene yokota bf8b6cbe36 Merge pull request #2484 from eed3si9n/fport/2313
FPORT: Refix snapshots
2016-02-27 06:13:01 -05:00
eugene yokota 05799ca346 Merge pull request #2423 from Duhemm/wip/use-util-scripted
Use scripted engine from sbt/util
2016-02-27 04:28:44 -05:00
Eugene Yokota 9107fb3bdf Bump up ivy to 2.3.0-sbt-2cc8d2761242b072cedb0a04cb39435c4fa24f9a 2016-02-27 04:07:33 -05:00
Eugene Yokota 883255b05a Bump up ivy to 2.3.0-sbt-39ece6f17e1af62c2e89a9d88b59c0c3aad56145
Ref sbt/ivy#21
2016-02-27 04:07:33 -05:00
Eugene Yokota ff7ac294e7 Adds more memory to internal scripted task 2016-02-26 17:58:35 -05:00
Martin Duhem bf12a2b9c6 Update incrementalcompiler to 0.1.0-M3 2016-02-24 19:49:09 +01:00
Martin Duhem 20d0c41473 Update to latest util, incrementalcompiler and librarymanagement 2016-02-24 16:54:03 +01:00
Dan Sanduleac 1d8ec0430d Depend on custom librarymanagement 0.1.0 which contains the sourcesDocs changes. 2016-02-23 12:02:11 +00:00
Martin Duhem 9bc50e558e Use scripted engine from sbt/util 2016-01-26 14:51:14 +01: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 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 01b46a6d6a Include sbt-ivy-snapshots to launchconfig
Forward-port of #2338.

Include sbt-ivy-snapshots to launchconfig
Prior to this change, the launchconfig for sbt was generated using
Transform's resource generator so releases would include
`typesafe-ivy-releases` repo, and snapshot releases would include
`typesafe-ivy-snapshots` and `sonatype-snapshots` repos in addition.
This is no longer useful since nightly builds are now published to
`sbt-ivy-snapshots` instead, which is backed by Bintray.

This removes the switching logic, so both `typesafe-ivy-releases` and
`sbt-ivy-snapshots` repos are always included into the launchconfig.
This removes the step of needing to download a launcher just to try the
nightly builds.
2016-01-16 16:52:12 +00:00
Dale Wijnand de10d81f07 Upgrade sbt plugins. Fixes #2368
Cherry-picked 84cba9669c from branch 0.13 to 1.0.x

Tested manually:

  $ grep 'version.*:=' build.sbt
  version := "0.13.10-SNAPSHOT",
  $ git archive --prefix=sbt-0.13.10-SNAPSHOT/ -o ~/Desktop/sbt-0.13.10-SNAPSHOT.tgz HEAD
  $ cd ~/Desktop
  $ ls
  sbt-0.13.10-SNAPSHOT.tgz
  $ tar xfz sbt-0.13.10-SNAPSHOT.tgz
  $ cd sbt-0.13.10-SNAPSHOT/
  $ sbt info
  [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/0.13/plugins
  [info] Loading project definition from /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project
  [info] Updating {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/}sbt-0-13-10-snapshot-build...
  [info] Resolving org.fusesource.jansi#jansi;1.4 ...
  [info] Done updating.
  [warn] There may be incompatibilities among your library dependencies.
  [warn] Here are some of the libraries that were evicted:
  [warn]  * com.typesafe.sbt:sbt-site:0.8.1 -> 0.8.2
  [warn] Run 'evicted' to see detailed eviction warnings
  [info] Compiling 12 Scala sources to /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/target/scala-2.10/sbt-0.13/classes...
  [info] This is sbt 0.13.9
  [info] The current project is {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/}sbtRoot 0.13.10-SNAPSHOT
  [info] The current project is built against Scala 2.10.6
  [info] Available Plugins: sbt.plugins.IvyPlugin, sbt.plugins.JvmPlugin, sbt.plugins.CorePlugin...
  [info] sbt, sbt plugins, and build definitions are using Scala 2.10.5
2016-01-16 12:19:09 +00:00
Eugene Yokota f14692f0b1 changes due to bumping up librarymangement to 0.1.0-M4 2015-10-02 00:25:45 -04:00
Eugene Yokota 814ceeab79 librarymanagement 0.1.0-M3 to use internal syntax 2015-10-01 23:28:27 -04:00
Eugene Yokota 9eb718ae45 Fixes actions/depends-on 2015-10-01 01:57:02 -04:00
Eugene Yokota 51f1aaf429 bump incrementalcompiler to 0.1.0-M1-168cb7a4877917e01917e35b9b82a62afe5c2a01 2015-09-28 22:55:50 -04:00
Eugene Yokota 741984ea82 incrementalcompiler bump 2015-09-17 17:10:19 -04:00
Eugene Yokota bb8133eaba use incremental compiler version instead of sbt version 2015-09-14 23:43:32 -04:00
Eugene Yokota 7132491f6c Rewire to new modules 2015-09-14 03:27:22 -04: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
Dale Wijnand 09ae28803c Fix SNAPSHOT srcs/docs with Ivy upgrade. 2015-08-25 12:42:03 +01:00
Dale Wijnand 553dffec39 Upgrade to 0.13.9. 2015-08-19 12:16:03 +01:00
Martin Duhem d84573c9d3 Include pending scripted tests in * and *aofb 2015-08-19 09:11:02 +02:00
Dale Wijnand 07d7cdcb51 Update scala211 to 2.11.7. 2015-08-05 23:10:56 +01:00
Pierre DAL-PRA 54d54b9f4f Replace procedure syntax by explicit Unit annotation 2015-08-04 10:07:38 +02:00
Josh Suereth eba37d84b1 Bump to latest version of ivy.
Fixes #2118
2015-07-27 16:26:39 -04:00
Dale Wijnand cb3f7d58a5 Bump sbt/serialization to v0.1.2. 2015-07-18 18:18:33 +01:00
eugene yokota 67d908a4a6 Merge pull request #2101 from sbt/0.13.9
merge 0.13.9 on 0.13
2015-07-10 16:07:05 -04:00
Pierre DAL-PRA 3ffa333c14 Fix most build warnings 2015-07-10 11:53:48 +02:00
Eugene Yokota 8cde12887e Ref #2068. Scala version bump needs to accompany scala-reflect bump. 2015-07-09 21:20:47 -04:00
Eugene Yokota 538982928a Fixes #2005. Bump to ivy 2.3.0-sbt-c5d1b95fdcc1e1007740ffbecf4eb07abc51ec93
When I went digging into Ivy's code base I discovered that it's been
checking if the repository layout pattern ends with M2_PATTERN to use
maven-metadata.xml, which for sbt would return false since we customize
the mattern -
https://github.com/apache/ant-ivy/blob/2.3.0/src/java/org/apache/ivy/plu
gins/resolver/IBiblioResolver.java#L497-L499
2015-06-25 16:39:22 -04:00
Eugene Yokota 618ac5236a Bumping up Scala version to 2.10.5/2.11.6. Fixes #1980
To pass File => Unit callback across the classloader boundary
I am encoding it as a java.util.List[File] by overriding
 method.
This was needed since Java didn't allow me to cast
from one classloader to the other.
2015-06-19 16:51:39 -04:00
Eugene Yokota 2da38b92b1 publish nightlies to bintray 2015-04-20 12:51:18 -04:00
Eugene Yokota f4dbdae3c3 publish to bintray 2015-04-20 10:56:37 -04:00
eugene yokota bb111fdac4 Merge pull request #1942 from ajozwik/patch-1
Updated to 0.13.9-SNAPSHOT
2015-03-26 09:03:56 -07:00
Andrzej Jozwik 29c99c0780 Updated to 0.13.8 2015-03-26 08:56:16 +01:00
Josh Suereth 86517928c6 Fix test to ignore bintray, and updated to 1.0.0-M1 launcher. 2015-03-25 15:02:09 -04:00
Josh Suereth a27bb97415 sbt-plugins don't copy over to bintray, so we still need to hit maven central, but last. 2015-03-25 07:40:46 -04:00
Josh Suereth a1b8102d81 Fix repositories for dealing with snapshot modules. 2015-03-24 18:42:00 -04:00
Josh Suereth 004a557c37 Remove unused proguard configuration. 2015-03-24 18:37:57 -04:00
Josh Suereth 9380ca02eb Migrate to using the sbt/launcher module, rather than having the code embedded.
* Remove launch/* code/tests, as these are in the sbt/launcher project.
* Create a new project which will resolve launcher module from sonatype-snapshots,
  and repackage it for the currently building version of sbt.
* Remove ComponentManagerTest which was relying DIRECTLY on launcher classes.
  We'll need to reconfigure this shortly to enable the tests again.

Remaining TODOs -

* Update resolvers so people can find the launcher.
* Add ComponentManagerTest back.
* Re-publish the sbt-launch.jar in the location it used to be published.
2015-03-24 16:12:51 -04:00
Josh Suereth 8e0862b011 Start using launcher interface from sbt/launcher module. 2015-03-24 11:14:13 -04:00
Eugene Yokota fdea36118d Remove custom picklers
- sbt/serialization supports these
2015-03-09 21:22:58 -04:00
Eugene Yokota 40b65c914a Write JSON to file without String. #1763 2015-03-09 21:22:58 -04:00
Eugene Yokota ef1ec99bd0 Implement pickler for UpdateReport. #1763 2015-03-09 21:22:57 -04:00
Eugene Yokota 2c82d339d7 Fix nightly publishing location by demoting publish-status to ThisBuild 2015-02-17 23:43:09 -05:00
Eugene Yokota 989446fbe6 Revert "remove precompiled compiler bridges"
This reverts commit f2e5d48b6b.
2015-02-17 13:33:54 -05:00
Eugene Yokota 8dbed8ad88 Split proguarded launcher out to a subproject 2015-02-06 14:40:19 -05:00
Eugene Yokota f2e5d48b6b remove precompiled compiler bridges
- Scala 2.8.x or 2.9.x are no longer used that often.
- Precompiled is a cross build liability as sbt (2.10.4) depends on 2.8.x/2.9.x code.
- Scripted test was modified to check 2.8 and 2.9 compilation
2015-02-03 19:36:45 -05:00
Eugene Yokota 883792e3c3 sbt-doge 0.1.3 2015-02-03 00:40:19 -05:00
Eugene Yokota f65712e90d Fix build 2015-02-02 22:44:02 -05:00
eugene yokota be78b7fc4c Merge pull request #1759 from jedesah/topic/minor_cleanup
Minor code cleanup
2015-01-14 16:13:06 -05:00
Eugene Yokota 75e7b47718 Run scripted with sbt-maven-resolver 2015-01-12 22:01:16 -05:00
Josh Suereth e3931dbfec Create a new Ivy DependencyResolver which uses Aether.
* Here we wire Aether into the Ivy dependency chain
* Add hooks into Aether to use Ivy's http library (so credentials are configured the same)
* Create the actual Resolver which extracts metadata information from Aether
* Deprecate old Ivy-Maven integrations
* Create hooks in existing Resolver facilities to expose a flag to enable the new behavior.
* Create notes documenting the feature.
* Create a new resolver type `MavenCache` which denotes how to read/write local maven cache metadata
  correctly.  We use this type for publishM2 and mavenLocal.
* Update failing -SNAPSHOT related tests to use new Aether resolver
* Create specification for expected behavior from the new resolvers.

Known to fix #1322, #321, #647, #1616
2015-01-08 08:53:25 -05:00
Eugene Yokota 5ce7c5aaca Fixing cross building 2014-12-18 17:40:20 -05:00
Eugene Yokota a903aafd7c Fix java version check, and use scope filter 2014-12-18 13:14:04 -05:00
Eugene Yokota 4cac42f56c Factor out dependencies 2014-12-18 07:57:05 -05:00
Eugene Yokota 91de6c6b79 Multi-project build.sbt 2014-12-17 23:38:10 -05:00
Jean-Rémi Desjardins 8ef3cd5871 Revert accidental style change 2014-12-05 15:37:31 -08:00
Josh Suereth fda9252250 Merge pull request #1752 from sbt/wip/1752
Cached resolution is too verbose
2014-12-04 17:09:34 -05:00
Eugene Yokota 607b686cb2 Fixes #1752. Fixes cached resolution too verbose.
- Fixes cached resolution being too verbose
- Adds new UpdateLogging named "Default"
- When global logLevel or logLevel in update is Debug, Default will
bump up to Full UpdateLogging.
2014-12-04 12:34:30 -05:00
Jean-Rémi Desjardins ca736e55d3 Minor code cleanup 2014-12-03 09:56:34 -08:00
Josh Suereth 3c4bc23cdb First set of refactorings from review.
* Split Java analyzing compile into its own class.
* MixedAnalyzingCompiler now only does the mixing
* Start moving methods around to more-final locations
* Static analyzingCompile method now constructs a MixedAnalyzingCOmpiler and delegates to incremental compile.
2014-12-01 13:35:51 -05:00
Josh Suereth 31088791da Reset sbt version after merge. 2014-10-29 20:33:40 -04:00
Josh Suereth 9aacec8918 Bump RC version for release. 2014-10-29 20:13:25 -04:00