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

109 Commits

Author SHA1 Message Date
Eugene Yokota 2f8d9ad8ca move CrossVersion to src/ 
Fixes sbt/sbt#4595
Ref #290
Ref #280

This is bit of an odd one.

To keep bincompat and also to fix sbt 0.13 compatibility issue we have made `Disabled` companion object extend `Disabled` type.
This actually created a subtle deserialization issue:

```
[error] scala.MatchError: Disabled() (of class sbt.librarymanagement.Disabled$)
[error] 	at sjsonnew.FlatUnionFormats$$anon$5.write(FlatUnionFormats.scala:220)
[error] 	at sjsonnew.JsonWriter.addField(JsonFormat.scala:40)
[error] 	at sjsonnew.JsonWriter.addField$(JsonFormat.scala:37)
[error] 	at sjsonnew.FlatUnionFormats$$anon$5.addField(FlatUnionFormats.scala:208)
[error] 	at sjsonnew.Builder.addField(Builder.scala:43)
[error] 	at sbt.librarymanagement.ModuleIDFormats$$anon$1.write(ModuleIDFormats.scala:46)
```

This is because Contraband generates `flatUnionFormat5[CrossVersion, Disabled, ...]` for all of the subtypes of `CrossVersion`, which uses the runtime type information. Now that `Disabled` object is also in the mix, this created JSON that `CrossVersionFormats` cannot deserialize. This brings the code into src/ so we can write this part manually.
 2019-04-01 23:35:39 -04:00
Eugene Yokota 83a28b0b3d bump IO and Util 2019-03-22 13:53:17 -04:00
Eugene Yokota 7f19274304 sbt 1.2.8 2019-03-22 13:47:32 -04:00
Eugene Yokota 75c319e6bb make object Disabled extend Disabled 
Ref https://github.com/sbt/librarymanagement/pull/280

This is to workaround bincompat error detected by sbt community build.

```
[cats] [error] java.lang.NoSuchMethodError: sbt.librarymanagement.CrossVersion$.Disabled()Lsbt/librarymanagement/Disabled$;
```
 2019-01-23 15:06:47 -05:00
Eugene Yokota e36ddd64ab Bump Ivy 
Ref https://github.com/sbt/ivy/pull/31
 2018-12-28 17:15:43 -05:00
Eugene Yokota 08b8491c7f Bump IO and Util 2018-10-29 14:25:01 -04:00
andrea d18c37974a going on, everything but sbt-plugins looks working 2018-10-16 12:31:07 +01:00
andrea e1ce3a07c5 compilation and tests are ok 2018-10-15 10:34:14 +01:00
Leonard Ehrenfried ed25bcba43 Add implementation of coursier 2018-10-15 10:24:34 +01:00
Eugene Yokota cb92556c7f sbt-scalafmt 0.15 to align with sbt/sbt 2018-10-15 03:10:00 -04:00
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