luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,940 Commits 22 Branches 333 Tags 97 MiB
Commit Graph

17940 Commits

Author SHA1 Message Date
eugene yokota 412709ce50
Merge pull request #203 from marcospereira/fix-java-version-detection 
Remove -Xmx512M flag when detecting java version
 2018-01-04 03:30:25 -05:00
Dale Wijnand f2f44c738c
Merge pull request #3836 from dwijnand/projectToLocalProject 
Introduce projectToLocalProject to replace projectToRef
 2018-01-03 16:36:34 +00:00
Marc Prud'hommeaux 0c6e2ae64c Added sqlline example (#727) 
Added sqlline example
 2018-01-03 10:08:05 +01:00
Marcos Pereira f9295a6715
Remove -Xmx512M flag when detecting java version 
The flag can cause problems when there is another configuration
adding -Xms with a value bigger than 512M. The `java -version`
command will fail and no java version will be detected, causing
a failure in `checkJava`.
 2018-01-02 18:15:07 -02:00
eugene yokota 8ac280e094
Merge pull request #3835 from cunei/wip-disable-fork-parallel 
Keep "tests/fork-parallel" disabled, but add an explanation
 2018-01-02 15:09:36 -05:00
Dale Wijnand 365f5b6e78
Merge pull request #140 from xuwei-k/java9 
add Java 9 test
 2018-01-02 16:44:39 +00:00
Dale Wijnand 4752084f91
Introduce projectToLocalProject to replace projectToRef 
Fixes #3757
 2018-01-02 16:07:29 +00:00
Johannes Rudolph 5e3bbdb8c2
README: sbt 0.13 is only supported starting from 0.13.10 
Fixes #148.
 2018-01-02 13:55:48 +01:00
Martynas Mickevičius 085002957d Mention Archlinux package in the AUR (#726) 
Mention Archlinux package in the AUR
 2018-01-02 12:20:49 +01:00
Yi Cheng 5da2210d7f
Performance improvements for cli json report and minor refactoring (#724) 
Major change:
* Identified hotspot in `JsonElem.hashCode` because it hashes children recursively. Hence simplified hashing scheme, reducing CPU time on `JsonReport.apply()` from 64.7 sec to 2.5 sec

Other minor changes:
* Make `JsonRequirement` use immutable classes
* Simplify `JsonRequirement` composition
 2018-01-01 11:55:43 -08:00
Alexandre Archambault c8fa4638bc
Merge pull request #722 from coursier/topic/remove-sbt-launcher 
Remove remaining sbt launcher stuff
 2017-12-28 13:23:45 +01:00
Alexandre Archambault 0bbdcb8446 Remove remaining sbt launcher stuff 2017-12-28 11:47:04 +01:00
Alexandre Archambault c896e3867f
Merge pull request #721 from coursier/topic/remove-sbt-launcher 
Remove sbt-launcher project
 2017-12-28 11:45:01 +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 52fadd5efe
Merge pull request #629 from coursier/topic/sbt-1.0 
Switch build to sbt 1.0.4
 2017-12-27 17:56:44 +01:00
Alexandre Archambault d3360d640d Workaround for method not found for sbt 0.13 scripted tests 2017-12-27 16:38:21 +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 9df9c617be
Merge pull request #720 from coursier/topic/remove-http-server 
Remove http-server module
 2017-12-27 09:07:58 +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 0cba087fa0
Merge pull request #719 from coursier/topic/remove-echo 
Remove echo project
 2017-12-27 01:08:55 +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
xuwei-k 966f3ebaad add Java 9 test 2017-12-23 20:07:14 +09:00
cunei c3c487c8ab
Merge branch '1.1.x' into wip-disable-fork-parallel 2017-12-23 06:08:55 +01:00
Antonio Cunei eb0bf30712 Adjustments to test file. Scripted can't cope with empty comments 
Apparently an empty comment line, meaning a single '#' on a line,
cannot be fed to scripted, which will complain with an odd error
message.

This commit tweaks the comments in the tests/fork-parallel file
so that there are no empty comment lines.
 2017-12-23 05:00:38 +01:00
eugene yokota a28381e93a
Merge pull request #3837 from eed3si9n/wip/windows2 
Add Library interface
 2017-12-22 16:56:03 -05:00
Eugene Yokota 0aebb92ef5 don't block the build when server can't get up 2017-12-22 16:14:05 -05:00
Eugene Yokota 0a3900f53d Add Library interface 
Fixes #3821

Initially I missed why #3821 was failing.

Looking at it again, the error message reads:

```
Caused by: java.lang.IllegalArgumentException: Interface (NGWin32NamedPipeLibrary) of library=kernel32 does not extend Library
        at com.sun.jna.Native.loadLibrary(Native.java:566)
        at sbt.internal.NGWin32NamedPipeLibrary.<clinit>(NGWin32NamedPipeLibrary.java:38)
        ... 7 more
```

Inside `Native.loadLibrary`, it requires the "library" interface to extend `com.sun.jna.Library`, which this adds.
 2017-12-22 16:10:46 -05:00
eugene yokota 22b7518d5d
Merge pull request #3822 from cunei/wip-milliBis 
Use IO.getModifiedTimeOrZero(file) calls
 2017-12-22 13:03:55 -05:00
Eugene Yokota 7f0ff7c90a IO 1.1.3, Zinc 1.1.0-RC4 2017-12-22 11:45:31 -05:00
eugene yokota 203fce01eb
Merge pull request #192 from cunei/wip-milliBis 
Revert *ModifiedTime() calls to *lastModified*() calls
 2017-12-22 08:41:34 -05: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
eugene yokota d242fac409
Merge pull request #136 from cunei/wip-milliBis 
Revert *ModifiedTime() calls to *lastModified*() calls
 2017-12-22 08:03:55 -05:00
Eugene Yokota de54721fc3 IO 1.1.3 2017-12-21 22:43:53 -05:00
Eugene Yokota 2765e07add sbt 1.0.4 2017-12-21 22:43:38 -05:00
eugene yokota 0ed5cb6573
Merge pull request #139 from dwijnand/fix-EscHelpers.removeEscapeSequences 
Make EscHelpers.removeEscapeSequences handle partial escape sequences
 2017-12-21 22:38:51 -05:00
Antonio Cunei 94e36a14c8 Change modifiedTime definitions 2017-12-22 01:55:37 +01:00
Antonio Cunei ebff7919e9 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 01:55:37 +01: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
Antonio Cunei 0a1bd5a3b2 Change modifiedTime definitions 2017-12-22 00:13:27 +01:00
Antonio Cunei 8ba68eedfd 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:13:27 +01:00
Dale Wijnand 5ed25cbc56
Make EscHelpers.removeEscapeSequences handle partial escape sequences 
Fixes #67
 2017-12-21 17:09:30 +00:00
Dale Wijnand fd8b422488
Merge pull request #3760 from mpollmeier/mpollmeier/resolver-not-needed-if-not-publishing 
don't require publishTo specified if publishArtifact is `false`
 2017-12-21 15:40:17 +00:00
Antonio Cunei 8c7f93d7a5 Keep tests/fork-parallel disabled, but add an explanation 
See https://github.com/sbt/sbt/issues/3545#issuecomment-353247827
 2017-12-21 15:25:24 +01:00
Dale Wijnand bef5c9c996
Merge pull request #3833 from eed3si9n/wip/jna 
try to set jna.nosys to true programmatically
 2017-12-21 08:24:17 +00:00
Eugene Yokota 13e1862c2f set jna.nosys to true programmatically 
Previously I was seeing the error upon the first scripted test. I thought it was because Main was somehow not early enough. It might just be because scripted technically runs as part of the build.

Ref sbt/io#110
 2017-12-21 00:08:56 -05:00
Eugene Yokota d8609ced7f formatting 2017-12-20 22:36:07 -05:00