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

5643 Commits

Author SHA1 Message Date
Dale Wijnand e7b893fdc5
Cleanup and improve the unified slash syntax 2017-10-02 17:24:37 +01:00
Dale Wijnand 21bd7c3a91 Merge pull request #3434 from eed3si9n/wip/slash 
Unify sbt shell and build.sbt syntax (unified slash syntax redux)
 2017-09-28 09:26:25 +01:00
Eugene Yokota b0306b738e Add whitespaces in Show of scoped keys 
```
Provided by:
    ProjectRef(uri("...."), "root") / Test / test
Dependencies:
    Test / executeTests
    Test / test / streams
    Test / state
    Test / test / testResultLogger
```
 2017-09-28 03:34:49 -04:00
Eugene Yokota 33a01f3ceb Unified slash syntax 
Fixes sbt/sbt#1812

This adds unified slash syntax for both sbt shell and the build.sbt DSL.
Instead of the current `<project-id>/config:intask::key`,
this adds `<project-id>/<config-ident>/intask/key` where <config-ident> is the Scala identifier notation for the configurations like `Compile` and `Test`.

This also adds a series of implicits called `SlashSyntax` that adds `/` operators to project refererences, configuration, and keys such that the same syntax works in build.sbt.

These examples work for both from the shell and in build.sbt.

    Global / cancelable
    ThisBuild / scalaVersion
    Test / test
    root / Compile / compile / scalacOptions
    ProjectRef(uri("file:/xxx/helloworld/"),"root")/Compile/scalacOptions
    Zero / Zero / name

The inspect command now outputs something that can be copy-pasted:

    > inspect compile
    [info] Task: sbt.inc.Analysis
    [info] Description:
    [info] 	Compiles sources.
    [info] Provided by:
    [info] 	ProjectRef(uri("file:/xxx/helloworld/"),"root")/Compile/compile
    [info] Defined at:
    [info] 	(sbt.Defaults) Defaults.scala:326
    [info] Dependencies:
    [info] 	Compile/manipulateBytecode
    [info] 	Compile/incCompileSetup
    [info] Reverse dependencies:
    [info] 	Compile/printWarnings
    [info] 	Compile/products
    [info] 	Compile/discoveredSbtPlugins
    [info] 	Compile/discoveredMainClasses
    [info] Delegates:
    [info] 	Compile/compile
    [info] 	compile
    [info] 	ThisBuild/Compile/compile
    [info] 	ThisBuild/compile
    [info] 	Zero/Compile/compile
    [info] 	Global/compile
    [info] Related:
    [info] 	Test/compile
 2017-09-28 01:01:43 -04:00
Dale Wijnand 9f27590efd Merge pull request #3577 from laughedelic/patch-1 
Changed default version setting to 0.1.0-SNAPSHOT
 2017-09-27 09:53:40 +01:00
Alexey Alekhin 5384114185 Merge branch '1.x' into patch-1 2017-09-26 21:30:04 +02:00
Dale Wijnand 67d1da48f1 Merge pull request #3566 from jonas/scripted-skip-1.0 
Fix #3564: Filter scripted tests based on project/build.properties
 2017-09-26 14:34:24 +01:00
Alexey Alekhin 402b9ef95c Fixed version in the package-delete-target test 2017-09-26 13:13:33 +02:00
Alexey Alekhin e99aa6d7b3 Added release note for the `version` new default 2017-09-26 01:22:44 +02:00
Jonas Fonseca 3a666705a6 Add release note 2017-09-25 14:08:41 -04:00
Jonas Fonseca a08a93c5e6 Set deprecation version to 1.1.0 2017-09-25 13:56:42 -04:00
Alexey Alekhin 632b14cf78 Changed default version setting to 0.1.0-SNAPSHOT 
To make it compatible with semantic versioning. Fixes #3467.
 2017-09-25 15:06:17 +02:00
Dale Wijnand 9d8a041a06 Merge pull request #3556 from eed3si9n/wip/plain_portfile 
sbt client-server port discovery
 2017-09-25 13:58:44 +01:00
Eugene Yokota d5e24979bf Reference token file using URI and full file path 
Node didn't seem to like read URI out of the box, and I am not sure if File -> URI -> File conversion is universally accepted.

Ref sbt/sbt#3088
 2017-09-25 01:35:49 -04:00
Eugene Yokota 252e803de8 expand the token out to 128-bits 2017-09-22 01:30:27 -04:00
Eugene Yokota 348a077797 implement tokenfile authentication 2017-09-21 23:05:48 -04:00
Jonas Fonseca 62a1d42c55 Fix #3564: Filter scripted tests based on project/build.properties 
Skip scripted tests where the binary version configured in the build
does not match the binary version of sbt used for cross-building.
 2017-09-21 00:27:21 -04:00
Eugene Yokota 8a8215cf1b Use uri instead of url 2017-09-18 23:07:29 -04:00
Eugene Yokota c5bfc67750 Fixes test 2017-09-17 22:31:57 -04:00
Eugene Yokota 9d40404915 JSON port file 
This implements JSON-based port file. Thoughout the lifetime of the sbt server there will be `cwd / "project" / "target" / "active.json"`, which contains `url` field.

Using this `url` the potential client, such as IDEs can find out which port number to hit.

Ref #3508
 2017-09-17 19:19:56 -04:00
Eugene Yokota 6b8e716428 implement server handshake test 2017-09-16 22:29:58 -04:00
eugene yokota 4b8d31a9ea Merge pull request #3529 from sbt/1.0.x 
Merge 1.0.x
 2017-09-16 15:54:18 -04:00
eugene yokota 2e4873c7fb Merge pull request #3553 from eed3si9n/wip/bump_version 
1.0.3-SNAPSHOT
 2017-09-16 15:53:51 -04:00
Eugene Yokota 182b8296da 1.0.3-SNAPSHOT 2017-09-16 15:52:58 -04:00
eugene yokota c855f0cd9e Merge pull request #3551 from eed3si9n/wip/autostart 
`sbt.server.autostart` flag and startServer
 2017-09-16 15:25:11 -04:00
Eugene Yokota f21d190a65 `sbt.server.autostart` flag and startServer 
Adds JVM flag `sbt.server.autostart` to enable/disable the automatic starting of sbt server with the sbt shell.

This also adds a new command `startServer` to manually start the server.
 2017-09-16 03:24:30 -04:00
Eugene Yokota 8dbb00f3b1 notes 2017-09-16 02:37:30 -04:00
eugene yokota c514acc651 Merge pull request #3550 from eed3si9n/wip/lm_bump 
bump lm to 1.0.2
 2017-09-16 02:33:12 -04:00
Eugene Yokota 87e95e3a51 bump lm to 1.0.2 2017-09-16 01:43:42 -04:00
eugene yokota 6677802697 Merge pull request #3549 from eed3si9n/wip/zinc_bump 
bump Zinc to 1.0.1
 2017-09-16 01:28:07 -04:00
Eugene Yokota 4bd7010a4f bump Zinc to 1.0.1 
Fixes #2884
 2017-09-16 00:38:22 -04:00
eugene yokota caf2fa2cb8 Merge pull request #3523 from guillaumebort/1.0.x 
Sbt server could miss some messages
 2017-09-15 23:31:13 -04:00
eugene yokota 7420071f25 Merge pull request #3533 from razvan-panda/1.0.x 
Fix unused imports warnings
 2017-09-15 22:13:06 -04:00
eugene yokota 45765583a6 Merge branch '1.0.x' into 1.0.x 2017-09-15 19:47:08 -04:00
eugene yokota b4744486a8 Merge pull request #3546 from eed3si9n/wip/flaky 
Comment out flaky tests
 2017-09-15 19:41:42 -04:00
eugene yokota 43538bdbe6 Merge pull request #3526 from dwijnand/crossplusplus 
Redefine crossScalaVersions, because it's Def.derive..
 2017-09-15 19:09:11 -04:00
Eugene Yokota 3c5aaca15c comment out part of tests/fork-parallel 
Ref #3545
 2017-09-15 18:50:31 -04:00
Eugene Yokota 4ac231dd49 comment out part of run/error 
Ref #3543
 2017-09-15 18:48:07 -04:00
Dale Wijnand 71ae211841
Redefine crossScalaVersions, because it's Def.derive.. 
Fixes #3495
 2017-09-15 16:59:47 +01:00
Răzvan Flavius Panda 0124a8ad0e Fix unused imports warnings 2017-09-15 16:35:08 +01:00
eugene yokota d81d054bd2 Merge pull request #3507 from kczulko/issue-3453 
Fix for text echo issue when running sbt.
 2017-09-14 14:14:26 -04:00
kczulko e9fa4201fb Fix review issue. Add 't.restore' before function call. 2017-09-14 09:34:06 +02:00
Dale Wijnand da40288d6f Merge pull request #3517 from dwijnand/run-cp-dirs 
Fix run's support of directories in the classpath
 2017-09-13 16:07:36 +01:00
Dale Wijnand 3cb281945e
Alias when strings are a scala version 2017-09-13 16:03:51 +01:00
Dale Wijnand 930fac2a78
Restrict switchScalaVersion `projects` to just ResolvedReference's 2017-09-13 16:03:51 +01:00
Dale Wijnand 936733b2b1
Cleanup 2017-09-13 16:03:51 +01:00
Guillaume Bort b355aa66e4 Sbt server could miss some messages 
If the read buffer contains more that 2 messages, we need to consume them all before blocking on socket read again. For that we have to loop until the buffer does not contain anymore the message delimiter character.

Same problem in the client ServerConnection code.
 2017-09-13 13:18:38 +02:00
Dale Wijnand 103e40882f
Fix run's support of directories in the classpath 
Fixes #3504
 2017-09-13 10:21:41 +01:00
Dale Wijnand 53e41a0045
Dedup defining bgRun/bgRunMain 2017-09-13 10:21:40 +01:00
Dale Wijnand 363966da28 Merge pull request #3522 from eed3si9n/wip/travis2 
Undo _JAVA_OPTIONS enrivonment variable
 2017-09-13 10:12:30 +01:00