Commit Graph

260 Commits

Author SHA1 Message Date
Alexandre Archambault 9bd17e0fdd Switch to coursier 1.1.0-M12, use high level API 2019-02-26 13:37:30 +01:00
Scala steward b747d2598b Update slf4j-api to 1.7.26 (#36) 2019-02-19 13:02:19 +01:00
Alexandre Archambault 4226df911d Switch to coursier 1.1.0-M11-1 2019-02-06 15:20:51 -08:00
Alexandre Archambault 697d84ea1a Switch to coursier 1.1.0-M10 2019-02-01 00:52:59 +01:00
Scala steward c8e18af3ef Update jsr305 to 3.0.2 (#25) 2019-01-16 09:48:21 +01:00
Scala steward 9f396db6c1 Update asm-commons, asm-util to 7.0 (#21) 2019-01-14 07:10:07 +01:00
Scala steward 41640051d7 Update librarymanagement-ivy to 1.2.4 (#26) 2019-01-14 07:09:52 +01:00
Scala steward 07cbf3a199 Update librarymanagement-ivy to 1.0.4 (#22) 2019-01-13 23:52:44 +01:00
Scala steward 2efb919b89 Update utest to 0.6.6 (#20) 2019-01-13 23:51:39 +01:00
Scala steward c15ab4b130 Update jsr305 to 2.0.3 (#18) 2019-01-13 23:50:50 +01:00
Alexandre Archambault 6b1a84c563
Add addSbtCoursier helper to sbt-lm-coursier too (#16) 2018-12-12 11:19:05 +01:00
Alexandre Archambault 42d13bb07c
Switch to coursier 1.1.0-M9 (#13) 2018-12-03 12:34:11 +01:00
Alexandre Archambault 6cd9b7e2b4 Move ivy.xml generation stuff to sbt-coursier-shared 2018-11-20 17:18:19 +01:00
Alexandre Archambault c5e259f050 Add inter-project dependency support to sbt-lm-coursier 2018-11-20 15:59:09 +01:00
Alexandre Archambault 0225bc5ce7 Start to move some coursier specific keys to sbt-coursier-shared plugin 2018-11-20 15:55:55 +01:00
Alexandre Archambault 16574d8fc8 Remove sjson stuff
Too much fluff to compute a simple hash…
2018-11-20 15:53:21 +01:00
Alexandre Archambault ecee7fab99 Add sbt-lm-coursier plugin 2018-11-20 11:38:41 +01:00
Alexandre Archambault 55f457a6f7 Add DependencyResolutionInterface implementation in lm-coursier
Originally based on https://github.com/sbt/librarymanagement/pull/270
2018-11-20 11:25:16 +01:00
Alexandre Archambault af041251c1
Refactor sbt-coursier, move bits of it to new lm-coursier module (#6) 2018-11-20 10:16:08 +01:00
Alexandre Archambault 348a9f00c7 Make sbt-shared a simple library
Rather than a kind of sbt plugin
2018-11-14 14:52:36 +01:00
Alexandre Archambault e5b2e2ee13 Remove now unused sbt-compat
Unnecessary since sbt 0.13 support was dropped
2018-11-14 14:49:01 +01:00
Alexandre Archambault 49236d2e8f Remove unused stuff in build 2018-11-14 14:47:52 +01:00
Alexandre Archambault 6c8f06bd88 Tweak build.sbt 2018-11-05 10:35:18 +01:00
Alexandre Archambault 0906201eb1 Switch to latest coursier 2018-11-05 10:35:10 +01:00
Alexandre Archambault a3abe32525 Clean-up build 2018-10-17 14:18:03 +02:00
Alexandre Archambault 3b81a4ad5e Setup sbt-ci-release (WIP) 2018-10-17 14:18:03 +02:00
Alexandre Archambault 4855caa0f5 Move modules under modules/ 2018-09-28 18:36:32 +02:00
Alexandre Archambault 3e05d920a4 Keep only sbt plugins 2018-09-28 18:23:43 +02:00
Alexandre Archambault 49f7654b59
Use scalajs-bundler (#907) 2018-09-26 17:10:22 +02:00
Alexandre Archambault 528c2adc2f
Switch to latest scalajs-react, split web module sources (#906) 2018-09-26 12:09:29 +02:00
Alexandre Archambault dd7c8c19d4
Switch to sbt 1.2.3 (#887) 2018-09-25 12:30:30 +02:00
Alexandre Archambault db1884a84e Remove 2.10 stuff 2018-09-24 15:03:50 +02:00
Alexandre Archambault fd6e56f2f8 Silence slf4j in proxy tests 2018-09-19 17:55:20 +02:00
Alexandre Archambault 8a02ee8f15
Update things (#866) 2018-06-20 16:30:25 +02:00
Alexandre Archambault ec15269192
Update proguard settings, test proguarded JAR on CI (#811) 2018-04-23 11:38:16 +02:00
Alexandre Archambault f8884d4170 Re-enable Nexus proxy tests, launch the mirrors from the tests 2018-03-16 13:44:43 +01:00
Alexandre Archambault dbf3763037 Don't require publishing stuff locally prior to running scripted tests 2018-03-12 21:50:36 +01:00
Alexandre Archambault b1fde7291d Don't require manually running npm install before the JS tests 2018-03-12 21:50:35 +01:00
Alexandre Archambault 29f8d7b680 Remove scalaz dependency from core and cache, add scalaz-interop module 2018-03-12 21:50:35 +01:00
Alexandre Archambault fb5a2fde12 Merge cache and fetch-js projects 2018-03-12 20:50:22 +01:00
Dorothy Ordogh 3e4a65d5ee Add ability to fetch artifact with a given url (#774)
* changes

* changes to Attributes

* make changes

* add test and fix bug

* add more tests

* fix failing tests

* fix parentheses

* remove comments I added and add test that's guarenteed not to exist in a repo

* remove Attributes third parameter and refactor Parse's moduleVersionConfig to return a tuple of Dependency and a Map of String to String representing extra parameters for the dependency

* update some return types and methods in the Helper class

* return FallbackDependenciesRepository back to original state

* refactor helper

* remove url from attributes

* fix tests and add cache to extra in build.sbt

* remove FallbackDepsRepo from sbt-coursier

* add variable for url and call encode in tests

* update tests and helper to have proper behavior

* remove setting deps to intransitive when url is present and add two tests

* add more tests, implement @wisechengyi's comments

* fix nits

* update ParseTests because some failed

* fix tests

* incorporate feedback from @alexarchambault and @wisechengyi

* update ParseTests to check for returned error vs thrown error

* remove one test that is covered in ParseTests

* fix nits

* add back deleted brackets

* return errors in Left without using return statement

* revert change because it's broken

* fix some positional things

* add return statement or else error won't be processed

* fix nits. thanks @wisechengyi

* Remove return statements
2018-02-22 18:06:06 +01:00
Alexandre Archambault 4adf65f7e9
Automatically initialize git submodules if necessary (#785) 2018-02-21 11:26:16 +01:00
Leonard Ehrenfried df58a68a39 Remove more sbt._ types from sbt-shared (#775)
* Remove more sbt._ types from sbt-shared

* Replace sbt.url

* Upgrade to sbt-compat 1.2.6
2018-02-12 13:46:44 +01:00
Leonard Ehrenfried 4519faaf10 Remove sbt._ types from FromSbt.scala (#771)
* Remove more types from sbt._ namespace

* Use newest version of sbt-compat
2018-02-09 00:57:08 +01:00
Alexandre Archambault 335873a292
Merge pull request #748 from coursier/topic/update-cli
Switch the cli module to scala 2.12 and case-app 2.0.x
2018-02-07 22:29:48 +01:00
Alexandre Archambault 506e14a90b Switch cli to scala 2.12 and latest case-app 2018-02-07 10:23:07 +01:00
Leonard Ehrenfried 8d41447528 Remove more imports from sbt._ namespace (#766)
* Remove more imports from sbt._ namespace

* Bump sbt-compat to 1.2.4
2018-02-05 18:36:36 +01:00
Alexandre Archambault bd726d9e26 Remove unnecessary setting
It was added mostly to make the coursier-based sbt launcher
(https://github.com/coursier/sbt-launcher) work a bit better
2018-02-04 23:41:59 +01:00
Leonard Ehrenfried e18c4fa76c [sbt-shared] Use sbt.util.Logger instead of sbt.Logger (#764)
* Use sbt.util.Logger instead of sbt.Logger

* Bump sbt-compat, adds backport for sbt.util.Logger
2018-02-02 18:52:54 +01:00
Leonard Ehrenfried a8bdff26c5 Use released version of sbt-compat (#763) 2018-02-02 13:46:57 +01:00
Alexandre Archambault 8c72303ae9 Ensure POM files aren't added to classpath by bootstraps
They were when using the "isolated" classloader thing (that
https://github.com/jupyter-scala/ammonium and
https://github.com/jupyter-scala/jupyter-scala should probably be the only user of…)
2018-02-01 16:18:47 +01:00
Leonard Ehrenfried 387078aa87 Import correct resolver from librarymanagement #746 2018-01-31 15:26:21 +01:00
Alexandre Archambault 5a82ba903e Move tut-processed README.md under doc/readme 2018-01-29 20:45:28 +01:00
Dale Wijnand 70fa5f13cb Update, extract & override scala versions for plugins (#730)
* Update, extract & override scala versions for plugins

* Only override crossScalaVersions in sbt-plugins

That way (hopefully) the current CI setup using ++ doesn't break. See #730
2018-01-10 17:24:16 +01:00
Dale Wijnand 1bb7742d71 Replace most of SbtCompatibility with sbt-compat (#731) 2018-01-10 15:38:48 +01:00
Alexandre Archambault 0002798221 Remove sbt-launcher project
Now lives in its own repo at https://github.com/coursier/sbt-launcher
2017-12-28 10:19:05 +01:00
Alexandre Archambault 948361e429 More refined, and manual, activation of scripted
Allows to do a `sbt ++2.11.11 test:compile`, without the sbt plugin
modules or scripted being an issue.
2017-12-27 16:38:21 +01:00
Alexandre Archambault 6f37e95be6 Switch to sbt 1.0.4 2017-12-27 16:38:21 +01:00
Alexandre Archambault e97eaa18b5 Remove http-server module
Now has its own repo at https://github.com/coursier/http-server

Same Maven coordinates as before, `io.get-coursier:http-server_2.12`
2017-12-27 02:18:35 +01:00
Alexandre Archambault 3199d3ad54 Remove echo project
It now lives in its own repository at https://github.com/coursier/echo

Same Maven coordinates as before, io.get-coursier:echo
2017-12-26 23:56:02 +01:00
Yi Cheng a4258f48ce
Add json report to fetch and local exclusion option (#692)
This patch introduces changes for cli with json output #659. Format as follows:
```
{
  "conflict_resolution": {
    "org:name:version" (requested): "org:name:version" (reconciled) 
  },
  "dependencies": [
    {
      "coord": "orgA:nameA:versionA",
      "files": [
        [
          <classifier>,
          <path>
        ]
      ],
      "dependencies": [ // coodinates for its transitive dependencies
        <orgX:nameX:versionX>,
        <orgY:nameY:versionY>,
      ]
    },
    {
      "coord": "orgB:nameB:versionB",
      "files": [
        [
          <classifier>,
          <path>
        ]
      ],
      "dependencies": [ // coodinates for its transitive dependencies
        <orgX:nameX:versionX>,
        <orgZ:nameZ:versionZ>,
      ]
    },
  ]
}
```
For example:
```
fetch -t org.apache.avro:trevni-avro:1.8.2  org.slf4j:slf4j-api:1.7.6 --json-output-file x.out
  Result:
├─ org.apache.avro:trevni-avro:1.8.2
│  ├─ org.apache.avro:trevni-core:1.8.2
│  │  ├─ org.apache.commons:commons-compress:1.8.1
│  │  ├─ org.slf4j:slf4j-api:1.7.7
│  │  └─ org.xerial.snappy:snappy-java:1.1.1.3
│  └─ org.slf4j:slf4j-api:1.7.7
└─ org.slf4j:slf4j-api:1.7.6 -> 1.7.7
```
would produce the following json file:
```
$ jq < x.out 
{
  "conflict_resolution": {
    "org.slf4j:slf4j-api:1.7.6": "org.slf4j:slf4j-api:1.7.7"
  },
  "dependencies": [
    {
      "coord": "org.apache.avro:trevni-core:1.8.2",
      "files": [
        [
          "",
          "/Users/yic/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/apache/avro/trevni-core/1.8.2/trevni-core-1.8.2.jar"
        ]
      ],
      "dependencies": [
        "org.slf4j:slf4j-api:1.7.7",
        "org.xerial.snappy:snappy-java:1.1.1.3",
        "org.apache.commons:commons-compress:1.8.1"
      ]
    },
    {
      "coord": "org.apache.avro:trevni-avro:1.8.2",
      "files": [
        [
          "",
          "/Users/yic/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/apache/avro/trevni-avro/1.8.2/trevni-avro-1.8.2.jar"
        ]
      ],
      "dependencies": [
        "org.apache.avro:trevni-core:1.8.2",
        "org.slf4j:slf4j-api:1.7.7",
        "org.xerial.snappy:snappy-java:1.1.1.3",
        "org.apache.commons:commons-compress:1.8.1"
      ]
    },
    {
      "coord": "org.slf4j:slf4j-api:1.7.7",
      "files": [
        [
          "",
          "/Users/yic/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"
        ]
      ],
      "dependencies": []
    },
    {
      "coord": "org.apache.commons:commons-compress:1.8.1",
      "files": [
        [
          "",
          "/Users/yic/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
        ]
      ],
      "dependencies": []
    },
    {
      "coord": "org.xerial.snappy:snappy-java:1.1.1.3",
      "files": [
        [
          "",
          "/Users/yic/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/xerial/snappy/snappy-java/1.1.1.3/snappy-java-1.1.1.3.jar"
        ]
      ],
      "dependencies": []
    }
  ]
}

```
2017-12-26 10:46:35 -08:00
Alexandre Archambault ee9c61393c Move FromSbt / ToSbt helpers to separate module 2017-12-11 10:07:04 +01:00
soc 1871610751 Introduce support for OS-specific standard cache directories (#676)
This cleans up the home directories of users and helps making sure that
Coursier's cache is not accidentically backed up by applications or OS
functionality.

The precedence is as follows:

- existing $COURSIER_CACHE environment variable
- existing coursier.cache Java property
- existing operating system specific standards:
  - Linux:   $XDG_CACHE_HOME/coursier, with fallback to ~/.cache/coursier
  - Windows: {SpecialFolder.LocalApplicationData}/cache/Coursier
  - macOS:   $HOME/Library/Caches/Coursier
- existing ~/.coursier/
- fallback to operating system specific standard directory else.

See discussion in https://github.com/coursier/coursier/pull/676#issuecomment-338974822
2017-10-27 14:35:01 +02:00
Alexandre Archambault 34cce59b65 Minor tweaks 2017-10-26 01:36:55 +02:00
Alexandre Archambault ce2a01af40 Bump plugins 2017-10-21 01:53:25 +02:00
Alexandre Archambault 8f988d4d08 Prevent tags to be split in generated Ivy XML 2017-08-30 01:26:46 +02:00
Alexandre Archambault b91031034c Use custom published scala-native stuff 2017-07-11 20:36:00 +02:00
Alexandre Archambault 3271d90b26 Use custom published version of jarjar 2017-07-11 19:11:18 +02:00
Alexandre Archambault 7d69815f64 Allow to generate native bootstraps 2017-07-08 14:32:16 +02:00
Alexandre Archambault e33787e916 Update sbt-launcher, add sbt-coursier by default 2017-06-24 15:57:04 +02:00
Alexandre Archambault 208f18f518 More careful handling of the bootstrap.jar resource
It seems that blindly putting it in resourceGenerators makes proguard...
proguard it.
2017-06-12 01:55:28 +02:00
Alexandre Archambault 9e7cc6dec4 Have boostraps use the main coursier cache 2017-06-09 18:13:13 +02:00
Alexandre Archambault 995e8c70fd Add sbt-pgp-coursier plugin 2017-06-07 14:24:21 +02:00
Alexandre Archambault 510646d596 Clean-up 2017-06-06 18:01:29 +02:00
Alexandre Archambault fa8d952e81 Make the proguarded JAR directly runnable 2017-06-01 13:08:20 +02:00
Alexandre Archambault f5ef7d8179 Add non-reg tests for Nexus proxies
Ensure everything work fine again with those (things went bad at
1.0.0-RC1, because of the use of directory listings, that may not be
exhaustive in proxies - or may be just empty, e.g. currently with nexus 3)
2017-05-31 21:19:27 +02:00
Alexandre Archambault f609e65f8b Add helper aggregate project 2017-05-31 15:24:53 +02:00
Alexandre Archambault 12e9ca3e08 Java-ize echo module 2017-05-16 17:05:32 +02:00
Alexandre Archambault 203e3fd477 Only compile http-server module in 2.12
So that we don't have to wait on its dependencies to add preliminary
support for scala 2.13
2017-05-15 18:54:29 +02:00
Alexandre Archambault 3656389fff Only compile sbt-launcher module in 2.11
So that we don't have to wait on its dependencies to add preliminary
support for scala 2.13
2017-05-15 18:54:29 +02:00
Alexandre Archambault 763106bf96 Switch to tut 0.5.1 2017-05-15 18:54:29 +02:00
Alexandre Archambault f62a110cfa Bump dependencies 2017-05-15 18:54:29 +02:00
Alexandre Archambault 9c7168fbc7 Add alias 2017-05-15 15:32:48 +02:00
Alexandre Archambault 89c3b3544d Don't create too visible empty directories during build 2017-05-15 15:32:48 +02:00
Alexandre Archambault f8c05d570b Dummy renaming in build 2017-05-15 15:32:47 +02:00
Alexandre Archambault e76f6170f1 Move typelevel-related things to new extra module 2017-05-12 00:00:14 +02:00
Alexandre Archambault 3a2b253643 Shade jsoup too 2017-05-10 02:52:05 +02:00
Alexandre Archambault 1113555ed7 Test bootstrap generation 2017-05-05 18:04:20 +02:00
Alexandre Archambault 4679d5fadf Switch to latest http4s
Travis Mac CI now seems to be on Java 8, no need to compile the http-server module against the latest Java 7 compatible http4s
2017-04-29 17:35:26 +02:00
Alexandre Archambault 1380d7a741 Quick & dirty scaladex lookup 2017-04-03 10:09:33 +02:00
Alexandre Archambault 13262a3831 Rework build.sbt 2017-04-02 21:51:11 +02:00
Jentsch 711e744d75 Let compiler explain warnings 2017-03-23 21:07:50 +01:00
Alexandre Archambault c25b5517ed Update organization here or there 2017-03-20 00:41:04 +01:00
Alexandre Archambault 11a1e509b5 Allow proguarded jar to be launched straightaway
With the right bash header
2017-03-14 15:39:01 +01:00
Alexandre Archambault 23ea3ff6fa Add echo application
Simply echoes its arguments - for testing purposes
2017-03-14 15:39:00 +01:00
Alexandre Archambault 41c0cea23b Use https repo 2017-03-10 10:41:05 +01:00
Alexandre Archambault 2c18c9472c Don't shade too many things 2017-03-10 00:45:38 +01:00
Alexandre Archambault 9eff5f3402 Have publishSigned publish artifacts with shading
1.0.0-M15-3 -> 🗑️
2017-03-05 15:47:41 +01:00
Alexandre Archambault 112638582f Shade fastparse 2017-02-28 15:09:18 +01:00
Alexandre Archambault ab319b164f Shade jarjar into sbt-shading 2017-02-28 14:46:58 +01:00