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

1349 Commits

Author SHA1 Message Date
eugene yokota 705f64c8a4
Merge pull request #316 from eed3si9n/wip/disabled 
Make CrossVersion.Disabled stable
 2019-08-22 13:48:41 -04:00
Eugene Yokota 4a1b6232e4 deprecate CrossVersion.Disabled 2019-08-22 13:11:10 -04:00
Eugene Yokota c22cb34e7b Make CrossVersion.Disabled stable 
Fixes https://github.com/sbt/sbt/issues/4975

This makes `CrossVersion.Disabled` a stable identifier by reverting `final def` back to `final val`.

This is to fix Scala.JS build

```
[error] ScalaJSCrossVersion.scala:34:23: stable identifier required, but sbt.`package`.CrossVersion.Disabled found.
[error]     case CrossVersion.Disabled =>
[error]                       ^
[error] one error found
[error] (Compile / compileIncremental) Compilation failed
```

### notes

- #121 added `final val Disabled = sbt.librarymanagement.Disabled` but it was just a companion object
- #280 actually made it `final val Disabled = sbt.librarymanagement.Disabled()`, but this broke Cat's build that was calling `CrossVersion.Disabled()`
- #290 changed to `final def Disabled = sbt.librarymanagement.Disabled` and `object Disabled extends sbt.librarymanagement.Disabled`
- This changes back to `final val Disabled = sbt.librarymanagement.Disabled` (but because we changed the companion object in #290 that's ok)
 2019-08-22 01:54:14 -04:00
eugene yokota c9ca41a11e
Merge pull request #315 from eed3si9n/wip/bump 
bump modules
 2019-08-19 00:05:01 -04:00
Eugene Yokota 153ac7161d bump modules 2019-08-18 23:56:20 -04:00
eugene yokota edfe9c6c63
Merge pull request #314 from eed3si9n/wip/http 
Fix validatePatterns
 2019-08-18 00:27:22 -04:00
Eugene Yokota cc6147c8d2 Remove lmCommonTest 2019-08-17 23:55:58 -04:00
Eugene Yokota a9873101bf Fix validatePatterns 
https://github.com/sbt/librarymanagement/pull/312 had a bug.
 2019-08-17 22:17:58 -04:00
eugene yokota 9e1d4295e7
Merge pull request #313 from eed3si9n/wip/eviction 
improve "X is evicted completely"
 2019-08-14 12:40:50 -04:00
Eugene Yokota 8c16fd0edf switch to using scala-verify 2019-08-14 12:32:49 -04:00
Eugene Yokota 8fee1e2666 improve "X is evicted completely" 
Fixes https://github.com/sbt/sbt/issues/4946

1. This rewords "evicted completely" to "evicted for all versions"
2. Skips transitive and complete evictions (eviction that has no winner version)
 2019-08-13 23:35:50 -04:00
eugene yokota f58fa46c8c
Merge pull request #312 from eed3si9n/wip/http 
Deprecate HTTP resolvers
 2019-08-13 22:59:39 -04:00
Eugene Yokota fcc8b61011 use head -1 
SDKMAN lists the latest one first.
 2019-08-01 17:47:38 -04:00
Eugene Yokota c89695b4b2 Deprecate HTTP resolvers 
Ref https://github.com/sbt/sbt/issues/4905
 2019-08-01 16:20:22 -04:00
eugene yokota bc2650c551
Merge pull request #311 from eed3si9n/wip/latest 
Detect latest AdoptOpenJDK JDK 8 and 11
 2019-07-09 08:03:14 -04:00
Eugene Yokota 6329098beb Detect latest AdoptOpenJDK JDK 8 and 11 2019-07-09 07:39:12 -04:00
eugene yokota ff516eea2d
Merge pull request #308 from eed3si9n/wip/gigahorse 
Gigahorse 0.5.0
 2019-06-19 00:36:45 -04:00
Eugene Yokota 68adae1c8e remove jabba 2019-06-18 23:16:30 -04:00
Eugene Yokota 8a6bdff169 bump AdoptOpenJDK 2019-06-18 23:15:55 -04:00
Eugene Yokota ef4311acc8 Gigahorse 0.5.0 2019-06-18 23:10:35 -04:00
eugene yokota 39bd17f339
Merge pull request #307 from eed3si9n/wip/bump 
util 1.3.0-M7
 2019-05-13 15:05:33 -04:00
Eugene Yokota d15b406d14 util 1.3.0-M7 2019-05-13 13:40:52 -04:00
eugene yokota fa29a56a80
Merge pull request #306 from eed3si9n/wip/bump 
IO 1.3.0-M10, and nightly version
 2019-05-11 22:49:45 -04:00
Eugene Yokota b78f03b0d3 comment out scriptedIvy 2019-05-11 21:25:23 -04:00
Eugene Yokota 3a0ce65362 IO 1.3.0-M10, and nightly version 
Fixes #305
 2019-05-11 19:49:04 -04:00
Eugene Yokota acc1fd6b96 Remove lm-coursier out of this repo 
Ref https://github.com/coursier/sbt-coursier/pull/7
 2019-05-11 19:42:44 -04:00
eugene yokota faabc77123
Merge pull request #304 from eed3si9n/wip/bump 
sbt 1.3.0-M3
 2019-05-10 09:39:34 -04:00
Eugene Yokota 25ff7d2dd5 ClassLoaderLayeringStrategy.Flat 2019-05-10 00:11:39 -04:00
Eugene Yokota 2353be9eb6 fixpreloaded.sh 
Ref https://github.com/sbt/sbt/issues/4661
 2019-05-09 23:54:01 -04:00
Eugene Yokota 511dafb0e8 sbt 1.3.0-M3 2019-05-09 17:57:31 -04:00
eugene yokota bc65dd5a99
Merge pull request #303 from raboof/directCredentialsToString 
Add toString for DirectCredentials
 2019-05-09 12:21:41 -04:00
Arnout Engelen 4e46acde12
Add toString for DirectCredentials 
To make 'show credentials' more useful
 2019-05-09 14:06:03 +02:00
eugene yokota 984de6fe72
Merge pull request #302 from eed3si9n/wip/plugins 
bump plugins
 2019-04-30 00:11:37 -04:00
Eugene Yokota 6a36ce7689 applying Scalafmt 2.0.0-RC6 with sbt/sbt rules 2019-04-29 23:32:52 -04:00
Eugene Yokota 180af46fe5 bump plugins 2019-04-29 23:31:20 -04:00
eugene yokota 18f4fc75e5
Merge pull request #300 from eed3si9n/wip/isolate 
isolate Ivy homes during tests
 2019-04-29 01:32:30 -04:00
Eugene Yokota a28b546457 isolate Ivy homes during tests 2019-04-29 00:51:57 -04:00
eugene yokota f073dde812
Merge pull request #299 from eed3si9n/wip/gigahorse 
bump to Gigahorse 0.4.0
 2019-04-04 00:46:34 -04:00
Eugene Yokota 8c01d9f215 bump to Gigahorse 0.4.0 2019-04-04 00:19:34 -04:00
eugene yokota 767488b57f
Merge pull request #298 from eed3si9n/wip/customhttp 
Add OkHttpClient parameter
 2019-04-03 22:22:12 -04:00
Eugene Yokota 2e971b9a85 Add OkHttpClient parameter 
Ref #297

This adds a parameter so we can pass in OkHttpClient, if someone wants to customize HTTP behavior.
 2019-04-03 00:15:28 -04:00
eugene yokota 0d9ff2b63e
Merge pull request #296 from eed3si9n/wip/jsonformats 
move CrossVersion to src/
 2019-04-02 12:32:52 -04:00
eugene yokota 505efdd187
Merge pull request #295 from eed3si9n/wip/sdkman 
use SDKMAN to install JDKs and sbt
 2019-04-02 12:31:07 -04:00
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 1c4f90e926 use SDKMAN to install sbt 2019-03-25 01:47:54 -04:00
Eugene Yokota 8219f3c117 use SDKMAN to install JDKs 2019-03-24 22:49:06 -04:00
eugene yokota f6c267a208
Merge pull request #292 from 0lejk4/make_developer_email_optional 
make Developer email optional as it is not obligatory and some people…
 2019-03-22 15:08:18 -04:00
eugene yokota 5e4a3a557a
Merge pull request #294 from eed3si9n/wip/bump 
bump IO and Util
 2019-03-22 15:04:47 -04:00
Eugene Yokota 5645e36ee1 Remove lmCoursier 
There's an implementation of lmCoursier in the coursier project itself, so this seems redundant here.
 2019-03-22 13:58:56 -04:00
Eugene Yokota 83a28b0b3d bump IO and Util 2019-03-22 13:53:17 -04:00