Commit Graph

149 Commits

Author SHA1 Message Date
andrea 8b53d4a5c1 Scripted integration test infrastructure with Sbt 2018-10-12 09:18:17 +01:00
Eugene Yokota b0ea8ec55f Scala 2.12.7 2018-09-28 04:50:55 -04:00
Eugene Yokota 7c1caaf079 sbt 1.2.3 2018-09-28 04:33:50 -04:00
Eugene Yokota 949b5ec4ba Merge branch '1.2.x' into wip/merge-1.2.x 2018-09-28 04:33:26 -04:00
Eugene Yokota 02475c7a66 -Xfatal-warnings 2018-09-21 01:16:55 -04:00
Eugene Yokota 98f15d8c8a 1.2.1-SNAPSHOT 2018-08-01 00:13:09 -04:00
Eugene Yokota 5dd1e6adc3 Util 1.2.0 2018-07-29 20:34:40 -04:00
Sean Sullivan 127241f2c6 cleanup plugins.sbt 2018-06-28 05:59:58 -07:00
Eugene Yokota e97c79a243 IO 1.2.0-M2 2018-06-26 19:24:25 -04:00
Eugene Yokota 8e1e1e8121 IO, Util 1.2.0-M1 2018-06-18 04:46:51 -04:00
Eugene Yokota 6b86d05ce6 sbt-houserules 0.3.7 2018-06-14 02:22:38 -04:00
Eugene Yokota c0a0b7db0c Merge branch '1.1.x' into wip/merge-1.1.x 2018-06-14 01:42:01 -04:00
Eugene Yokota 3b6df7d105 Scala 2.12.6 and other dependencies
sbt 1.1.4
Scala 2.12.6
ScalaCheck 1.14.0
ScalaTest 3.0.5
2018-04-28 03:58:44 -04:00
Jason Zaugg 58bb203858 Upgrade to latest sbt-houserules 2018-04-08 14:36:41 +10:00
Eugene Yokota 1073513b49 Merge branch '1.1.x' into wip/merge-1.1.x 2018-03-27 06:19:28 -04:00
Eugene Yokota e0eb46a99e sbt 1.1.2 2018-03-26 22:50:03 -04:00
Eugene Yokota a29a12054a bump contraband to 0.4.0
Ref https://github.com/sbt/contraband/issues/119
2018-03-23 22:21:05 +09:00
Eugene Yokota f3b06bc18e bump util to 1.1.3 2018-03-23 18:13:59 +09:00
Dale Wijnand 512684f3e0
Merge pull request #217 from ryandbair/jsch
Bump to latest jsch to support stronger key exchange algorithms
2018-03-13 10:40:38 +00:00
Ryan Bair 14cc5ea626 Bump to latest jsch to support stronger key exchange algorithms 2018-03-09 08:43:41 -05:00
Dale Wijnand 866b0a1d3f
Upgrade to contraband 0.3.3 2018-03-09 12:54:15 +00:00
Dale Wijnand fce6d46bf3
Merge branch '1.1.x' into merge-1.1.x-into-1.x
* 1.1.x:
  Update version/mimaPreviousArtifacts/sbt.version
  clarify intent
  avoid deadlocks on spotty connections, fix https://github.com/sbt/sbt/issues/3738
  Add version 1.1.2 to mimaPreviousArtifacts
2018-02-14 11:02:29 +00:00
Dale Wijnand bfe347cd22
Update version/mimaPreviousArtifacts/sbt.version 2018-02-14 10:46:24 +00:00
Eugene Yokota c0ac7061db Reorganize existing tests 2018-01-12 23:10:15 -05:00
Dale Wijnand 039cb1591e
Add, configure & enforce sbt-whitesource 2018-01-11 14:02:45 +00:00
Dale Wijnand 0c187fa9ec
Upgrade to sbt 1.1.0 2018-01-10 16:06:25 +00:00
Eugene Yokota fa472179f5 sbt 1.0.4 2017-12-22 08:35:26 -05:00
Eugene Yokota b53c37b54f IO 1.1.3 and Util 1.1.2 2017-12-22 08:35:11 -05:00
Antonio Cunei 72dd0064c3 Change modifiedTime definitions 2017-12-22 00:55:24 +01:00
Antonio Cunei 42f23e62aa Revert *ModifiedTime() calls to *lastModified*() calls
There are just too many instances in which sbt's code relies on
the `lastModified`/`setLastModified` semantics, so instead of moving
to `get`/`setModifiedTime`, we use new IO calls that offer the new
timestamp precision, but retain the old semantics.
2017-12-22 00:27:30 +01:00
Dale Wijnand abf370adc3
Upgrade to sbt-houserules 0.3.5 2017-12-19 13:23:44 +00:00
Eugene Yokota 68356306ec bump modules and plugins 2017-12-15 14:07:05 -05:00
Antonio Cunei ca2617e99e Convert lastModified/setLastModified calls to sbt.io.Milli calls (more precise) 2017-12-15 14:06:16 -05:00
eugene yokota a8b53a23be
Merge pull request #184 from eed3si9n/wip/bump_util
Bump IO and Util
2017-11-24 17:26:27 -05:00
Eugene Yokota 7f3954d8bb Bump IO and Util 2017-11-24 17:14:46 -05:00
Dale Wijnand f4241c4d65
Bump to latest Ivy
Includes sbt/ivy#27 which fixes a JDK 9 issue.
Similar to PR sbt/launcher#46.
2017-11-15 15:58:29 +00:00
Eugene Yokota dcdbcd4979 Bump Ivy to 2.3.0-sbt-1b57d3bbc08ecf671169fd548918da18c91f77be
Ref https://github.com/sbt/ivy/pull/26
Ref sbt/launcher#38

JDK 9 complains when java.lang.reflect.Field#setAccessible is called. So on
JDK 9 to get the default Authenticator on JDK you can just call
Authenticator.getDefault(). However ivy targets JDK 6..

So on JDK < 9 we do what we've always done, and on JDK 9+ we use java
reflection to call Authenticator.getDefault(), which is public and doesn't
require setAccessible(true).
2017-10-24 03:16:17 -04:00
Eugene Yokota 03b531ca1e Use sbt 1.0.0 2017-08-26 13:42:11 -04:00
Dale Wijnand 63e63f05fa
Add back, re-configure & re-enable Scalafmt 2017-08-10 12:04:58 +01:00
Eugene Yokota 3258e7b413 IO 1.0.0, Util 1.0.0 2017-08-09 21:14:57 -04:00
Dale Wijnand 14cc1c56e2
Upgrade to sbt 1.0.0-RC3 2017-08-01 14:34:38 +01:00
Eugene Yokota 0a42cf0749 IO 1.0.0-RC3, Util 1.0.0-RC3 2017-07-28 12:47:57 -04:00
Eugene Yokota 831e99bd59 Contraband 0.3.0 2017-07-28 12:47:41 -04:00
Dale Wijnand 8f912301be
Upgrade to Scala 2.12.3 2017-07-28 07:56:02 +01:00
Dale Wijnand 1512d73a07
Upgrade to mima 0.1.15 & add exclusions 2017-07-26 11:40:54 +01:00
Dale Wijnand 66b8863d79
Add, configure & enable MiMa 2017-07-20 17:13:35 +01:00
Eugene Yokota d004e9e31a
sbt 1.0.0-RC2 2017-07-20 10:37:17 +01:00
Eugene Yokota 509c80c8a7 Bump to latest IO and Util 2017-07-15 13:52:10 -04:00
Eugene Yokota c95a885a3a Bump to latest Contraband 2017-07-15 11:17:23 -04:00
Eugene Yokota 7b22e78fd9 Library management API
This splits the core of LM and Ivy-based implementation.

- InlineConfiguration is renamed to ModuleConfiguration
- IvyScala is renamed to ScalaModuleInfo
- UpdateConfiguration, RetrieveConfiguration, PublishConfiguration are refactored to use builder pattern.
- Adds ConfigRef for referencing Configuration
- Moves syntax related things into `sbt.librarymagement.syntax`
2017-07-15 11:17:23 -04:00
Eugene Yokota 13e803d199 Use ConfigRef in reports 2017-07-08 16:10:09 +02:00
Eugene Yokota bc0ed18308 define def config(...) as a macro to capture the Scala identifier 2017-07-08 11:14:37 +02:00
Dale Wijnand 22df64365b
Replace util-collection dep with util-position
With Position being extracted to its own dependency we can drop this
dependency, allowing util-collection to move (back) to sbt/sbt!
2017-07-06 14:30:06 +01:00
Dale Wijnand f255894413
Drop RepositoriesParser & therefore util-completion
This code originates from a PR against sbt 0.13:
https://github.com/sbt/sbt/pull/2576

The sbt/librarymanagement part was forward-ported to
sbt/librarymanagement and merged, while the sbt/sbt part wasn't.

So let's get rid of this so we can drop the dependency on
util-completion.
2017-07-06 14:30:05 +01:00
Dale Wijnand 85cfe4d78c
Drop util-testing 2017-07-06 14:30:05 +01:00
Eugene Yokota 4ac724e529 bump to sbt-contraband 0.3.0-M7 and latest util 2017-07-01 19:44:49 -04:00
Eugene Yokota e8d5bcc600 bump sjson-new to latest 2017-07-01 19:16:16 -04:00
Eugene Yokota 60e1eb6275 Bump to sbt 1.0.0-M6 2017-06-17 02:19:37 -04:00
Eugene Yokota fd7cec0148 use okhttp to download the artifacts
This adds a custom URLHandler that internally uses Square OkHttp.

Fixes sbt/librarymanagement#95
2017-05-26 04:13:55 -04:00
Eugene Yokota dd4b33105b add Gigahorse 2017-05-15 16:34:38 -04:00
jvican 89b722c132
Update ivy version to include IVY-1515
https://github.com/sbt/ivy/pull/25
2017-05-09 11:02:34 +02:00
jvican d42ea869d0
Apply formatting 2017-04-26 22:55:38 +02:00
jvican 712c83f859
Configure scalafmt and disable scalariform 2017-04-26 22:53:17 +02:00
Eugene Yokota 4b0b3a05f9 Bump to util 1.0.0-M23
I'm now going to use `CacheStore.apply` in `JsonUtil` (used by cached resolution). This gets rid of `fileToStore` parameter from a bunch of classes and simplifies the setup around librarymanagement.
2017-04-17 13:29:02 -04:00
Eugene Yokota 3244e67040 Bump io and util 2017-04-05 00:13:49 -04:00
Eugene Yokota d6f0924689 Util 1.0.0-M20 2017-03-22 13:59:51 -04:00
Eugene Yokota 016db588d4 sbt-contraband 0.3.0-M4 2017-03-17 23:03:37 -04:00
eugene yokota 58e83e59fd Merge pull request #74 from dwijnand/build-warnings
Remove build warnings
2017-03-02 16:30:52 +01:00
Dale Wijnand 31a7407640
Remove build warnings
Also collapse into one meta-build sbt file.. imo a better alternative
toa adding a 5th single-line sbt file.
2017-03-02 14:42:36 +01:00
Eugene Yokota caecbbabe7 util 1.0.0-M19 2017-02-15 23:12:01 -05:00
Eugene Yokota a809e8744e Bump up Ivy
Fixes #2015
2017-01-15 20:55:02 -05:00
Eugene Yokota 5380b2fe73 Forward port "Support wildcard exclusions"
Ref https://github.com/sbt/sbt/pull/2731
2017-01-15 05:36:39 -05:00
Eugene Yokota 9dd1dff6cb Bump util 2017-01-13 22:48:32 -05:00
Eugene Yokota 9d812f4d98 Cross publish to Scala 2.12 2017-01-07 00:49:45 -05:00
Eugene Yokota 4ca5b5ae0a
Change publicationDate to java.util.Calendar
This migrates to java.util.Calendar, which is better than
java.util.Date and is supported by sjson-new out of the box.
2017-01-05 15:42:34 +00:00
Dale Wijnand 71fddd5e3f
Upgrade from sbt/datatype to sbt/contraband 2017-01-05 15:42:29 +00:00
Dale Wijnand 06c7f382ad
Cleanup & simplify Deps 2017-01-05 13:42:12 +00:00
Dale Wijnand 301ec787f2
Drop "serialising" Function1. It's easily fallible 2016-11-16 10:11:41 +00:00
Dale Wijnand f2efa10af1
Switch to sbt-datatype, sjson-new & Vectors 2016-11-15 23:59:34 +00:00
Dale Wijnand 8c4a969c9a
Add props to define source dependencies on io & util
Use either -Dsbtio.path / -Dsbtutil.path on the command line
or sbtio.path= / sbtutil.path= in project/local.properties
2016-11-02 14:27:12 +00:00
Dale Wijnand 9706577c67 Drop Scala 2.10, add openjdk7 2016-06-21 17:51:16 +01:00
Eugene Yokota 87b3ca04c0 Don't depend on other projects' tests 2016-05-11 14:12:10 -04:00
Eugene Yokota 4abaec8622 Fix dependencies 2016-05-10 00:38:26 -04:00
Eugene Yokota d304a95b24 Bump dependencies 2016-05-04 22:49:03 -04:00
Martin Duhem 65adc869d4 Implement static launcher for sbt
This is a combination of 13 commits. I squashed these 13 commits to make
forward porting those changes easier, since some commit undo the changes
of other commits.

The PRs that include these changes can be found at
https://github.com/sbt/sbt/pull/2564 and
https://github.com/sbt/sbt/pull/2576.

Static launcher, get bridge sources from resources

This commit introduces a new "static" launcher that does not use Ivy to
gather all the artifacts that it requires, but rather expect them to be
immediately available.

To be able to use sbt without Internet access, we add a new
`ComponentCompiler` that is able to retrieve the bridge sources from the
resources on classpath and compile it.

Fix classpath issues in static launcher

The launcher defines a top classloader that willbe used by all
`ScalaInstance`s. Previously, this top classloader had a parent that
contained the scala library 2.10, which prevented the correct
compilation of the compiler bridge for scala 2.11.

Also, we no longer need the scala-reflect JAR.

Tests for FakeResolver

Add `scala-reflect.jar` to JARs of `StaticScalaProvider`

It turns out we need to have `scala-reflect.jar` on classpath to compile
the compiler bridge for the static scala instance of the launcher.

Comply to Ivy's specification in `FakeResolver`

Remove `CompilerBridgeProvider` and `ResourceBridgeProvider`

It turns out that we can leverage the`FakeResolver` that has been
implemented to use with the static launcher, and resolve a "fake
compiler bridge" using it, rather than copying it from the resources.

This also has the advantage of not requiring to change the build
definition.

Fix NPE in FakeResolver

Add compiler bridge sources to fake resolver

This allows sbt to resolve the compiler bridge sources when using the
static launcher

Don't hardcode sbt version in static launcher

Add scala compiler and library to fake resolver

This allows us to still resolve them if we have no other resolver
configured.

Add `RepositoriesParser`

This parser is used by the static launcher to parse the definition of
resolvers that override the build resolvers.

Support repositories override in static launcher

The static launcher will now parse user-defined repositories like the
usual launcher does.

Specifically, the static launcher now uses the following configuration:

 - `sbt.boot.directory`: specifies the boot directory that sbt will use.
   Defaults to `~/.sbt/boot`.
 - `sbt.override.build.repos`: indicate whether we want to override the
   build resolvers. Defaults to false.
 - `sbt.repository.config`: specifies the path to the files that
   contains repositories definition. Defaults to
   `${sbt.boot.directory}/repositories`.

Notes for sbt/sbt#2564 & sbt/sbt#2576
2016-04-27 10:14:47 +02:00
Dale Wijnand 1bcefc6686 Bump sbt-houserules to add MiMa
See sbt/sbt#2383
2016-02-14 21:16:34 +00:00
Eugene Yokota 660d66ef1f Bump up ivy to 2.3.0-sbt-2cc8d2761242b072cedb0a04cb39435c4fa24f9a 2016-01-17 18:53:42 +00:00
Eugene Yokota 33ae444041 Bump up ivy to 2.3.0-sbt-39ece6f17e1af62c2e89a9d88b59c0c3aad56145
Ref sbt/ivy#21
2016-01-17 18:53:03 +00:00
Eugene Yokota b87fb4627e Update util to 0.1.0-M8 2015-12-24 02:02:20 -05:00
Eugene Yokota 82282a2090 bump util 2015-10-01 23:46:58 -04:00
Martin Duhem 699dcfdee5 Update to latest sbt-houserules, formatting 2015-09-16 14:57:00 +02:00
Martin Duhem dc814a5154 Add sbt-houserules, formatting 2015-09-10 16:08:58 +02:00
Eugene Yokota c65c5016b0 bump to up Util 0.1.0-M3 2015-09-07 02:59:23 -04:00
Eugene Yokota dbf9dc7450 bump to util 0.1.0-M2 and migrated to scalatest 2015-09-05 05:32:07 -04:00
Eugene Yokota 277c754e36 Merge #1 2015-09-02 03:03:20 -04:00
Eugene Yokota 7939e385c1 Bintray 2015-09-02 02:59:00 -04:00
Eugene Yokota e81b378214 Depend on sbt/util 2015-08-20 01:33:22 -04:00
Eugene Yokota 887cb7cc3e Code gen no longer needed 2015-08-19 04:13:08 -04:00
Eugene Yokota 319054fa32 Add build.sbt 2015-08-19 03:56:08 -04:00