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

5020 Commits

Author SHA1 Message Date
Eugene Yokota 6606958d40 Add { for readability 2017-04-04 18:49:37 -04:00
Dale Wijnand 7ac43c5e59 Tell the user we're setting sbt.version 2017-04-04 18:47:52 -04:00
Dale Wijnand cd63c1f844 Add -Dsbt.skip.version.write=true opt-out 2017-04-04 18:47:43 -04:00
Dale Wijnand a974ce7bb4 Write sbt.version to project/build.properties 
Have sbt.version set in project/build.properties is a best practice
because it makes the build more deterministic and reproducible.

With this change sbt, after ensuring that the base directory is probably
an sbt project, writes out sbt.version in project/build.properties if it
is missing.

Fixes #754
 2017-04-04 18:46:24 -04:00
eugene yokota a2b0037f64 Merge pull request #3071 from eed3si9n/fport/3014 
[fport] Check for regular file in Package.makeJar
 2017-04-04 15:23:43 -07:00
eugene yokota 075c3281b1 Merge pull request #3070 from eed3si9n/fport/2902 
[fport] Automatically choose proper compiler bridge for dotty
 2017-04-04 13:33:53 -07:00
Eugene Yokota f5cf8ef4a8 Adjust scripted test to sbt 1 2017-04-04 16:32:02 -04:00
Lars Hupel b20b8a0b18 test case for package target check 2017-04-04 16:29:06 -04:00
Lars Hupel da7d03ed48 avoid deleting the target of `makeJar` if it's not a file 2017-04-04 16:28:50 -04:00
Guillaume Martres 2283c68031 Automatically choose proper compiler bridge for dotty 
Before this commit, using dotty in your sbt project required to add:
  scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" %
    scalaVersion.value % "component").sources()
in your build.sbt. We might as well automatically do this, this reduces
the boilerplate for using dotty in your project to:
  scalaOrganization := "ch.epfl.lamp"
  scalaVersion := "0.1.1-SNAPSHOT"
  scalaBinaryVersion := "2.11" // dotty itself is only published as a
                               // 2.11 artefact currently
 2017-04-04 14:49:32 -04:00
eugene yokota 0a9dd9678d Merge pull request #3069 from dwijnand/rollback-runnerTask 
Switch Defaults.runnerTask back to a setting
 2017-04-04 09:50:17 -07:00
Dale Wijnand 4a6feb2b23
Switch Defaults.runnerTask back to a setting 
I believe this was an unintentional change in
74cfbd4a9c.
 2017-04-04 11:48:45 +01:00
Dale Wijnand 1020405d64 Merge pull request #3068 from dwijnand/kill-settingsSet 
Kill settingsSets
 2017-04-04 11:32:37 +01:00
eugene yokota 40f6c4d01b Merge pull request #3066 from eed3si9n/wip/testing 
[sbt 1.0] Proof-of-concept testing events
 2017-04-04 03:31:33 -07:00
Eugene Yokota 2a1d8fb9e7 Expose TestResult 2017-04-04 05:22:23 -04:00
Dale Wijnand 101187a3be
Kill settingsSets 
Fixes #2617
 2017-04-04 08:38:44 +01:00
Eugene Yokota 596dc62d7e util 1.0.0-M21 2017-04-04 02:39:33 -04:00
Eugene Yokota 622ebfd000 Switch to using util's JValueFormats 2017-04-03 03:41:45 -04:00
Eugene Yokota 304d167813 Send ObjectEvent as JSON 2017-04-03 03:17:57 -04:00
Eugene Yokota 093fc061cc Send testing events to logger 2017-04-01 17:19:45 -04:00
Eugene Yokota d6e0fd2f0d Sort the import alphabetically in Defaults 2017-04-01 17:13:28 -04:00
eugene yokota 4e267e5cb5 Merge pull request #3055 from dwijnand/build-warnings 
Remove warnings in the build setup
 2017-03-29 18:34:30 -07:00
Dale Wijnand 0dcb57b587
Remove warnings in the build setup 2017-03-29 14:43:41 +01:00
eugene yokota 1adce0a656 Merge pull request #3049 from dwijnand/scripted-crossed-note 
Add a note that the scripted plugin is cross-versioned now
 2017-03-28 20:49:20 -07:00
Dale Wijnand ece85b44bd Merge pull request #3032 from dwijnand/setting-query-json 
Start handling default types when serialising query setting values
 2017-03-28 10:45:46 +01:00
Dale Wijnand b1b66a241e
Add a note that the scripted plugin is cross-versioned now 2017-03-28 10:25:24 +01:00
eugene yokota 64ed7c7756 Merge pull request #3045 from dwijnand/fix-StateOps-fail 
Fix StateOps#fail != fail
 2017-03-27 19:48:52 -07:00
eugene yokota cb8acb2150 Merge pull request #3044 from dwijnand/propagate-weak-type-tags 
Fix inputTaskDyn not working
 2017-03-27 19:47:28 -07:00
Dale Wijnand c7be291946
Fix StateOps#fail != fail 2017-03-27 14:38:02 +01:00
Dale Wijnand 2bc5ba02f3
Add three more missing WeakTypeTags 
.. accidentally removed in 12c2734052
 2017-03-27 14:36:56 +01:00
Dale Wijnand 30bf72482b
Add test for a LM type 
Use libraryDependencies which is a Seq[ModuleID]
 2017-03-27 14:15:12 +01:00
Dale Wijnand 52de082b2e
Add OptJsonWriter to SettingKey 2017-03-27 14:15:11 +01:00
Dale Wijnand ad2f91e357
Extra getName/getImplicit in KeyMacro 2017-03-27 14:15:11 +01:00
Dale Wijnand 6950a1e061
Use the OptJsonWriter on AttributeKey 2017-03-27 14:15:10 +01:00
Dale Wijnand 63fcca5543
Test setting query functionality 2017-03-27 14:15:10 +01:00
Dale Wijnand 70ac55d0b4
Encode success/failure in setting query response 2017-03-27 14:15:10 +01:00
Dale Wijnand 875cf6f4dc
Simplify JValueFormat 2017-03-27 12:29:42 +01:00
Dale Wijnand 6211e8d7da
Move some things from terms to imports 2017-03-27 12:29:41 +01:00
Dale Wijnand 43eec230e6
Switch SettingQueryResponse to JValue, implement JValueFormat 2017-03-27 12:29:41 +01:00
Dale Wijnand f2b70de538
Implement a Manifest-based lookup 2017-03-27 12:29:41 +01:00
Dale Wijnand 342fc2cf8f
Commit to the current JsonFormatRegistry. 2017-03-27 12:29:41 +01:00
Dale Wijnand ede2b865b4
Allow disablePlugins(SbtScalariform) to work 
SbtScalariform is now an AutoPlugin, so its scalariformSettings are
already added to the project. So don't add it again otherwise
`disablePlugins(SbtScalariform)` won't work.

And miscellaneous cleanups.
 2017-03-27 12:29:40 +01:00
Dale Wijnand 6e6f66d6d0
Start structure to discover JsonWriter 2017-03-27 12:29:40 +01:00
Dale Wijnand 371f14d9a5
BuildStructure#root is SessionSettings#currentBuild 2017-03-27 12:29:40 +01:00
Dale Wijnand 992b35af3c
Start setup for JSON-format setting values 2017-03-27 12:29:39 +01:00
Dale Wijnand aa69d0d042
Split setting query things out into SettingQuery.scala 2017-03-27 12:29:39 +01:00
Dale Wijnand 4566c615c7
Move setting query things into SettingQuery 2017-03-27 12:29:39 +01:00
Dale Wijnand 8081661a7d
Fix ordering 2017-03-27 12:29:38 +01:00
Dale Wijnand 9f13499bcf
Don't double wrap setting value 
Oh the wonderful world of Object#toString
 2017-03-27 12:29:38 +01:00
Guillaume Martres 747aa48c9c Fix inputTaskDyn not working 
This fixes the following error when trying to use inputTaskDyn in a build:

[error] /tmp/sbt_8316130f/input-task-dyn/build.sbt:11: error: Macro
expansion contains free type variable T defined by wrap in
InputConvert.scala:76:20. Have you forgotten to use c.WeakTypeTag
annotation for this type parameter? If you
have troubles tracking free type variables, consider using -Xlog-free-types (out-1)
[error]     runFoo := Def.inputTaskDyn { (out-1)
[error]                                ^ (out-1)
[info] [error] sbt.compiler.EvalException: Type error in expression (out-3) (out-1)

I have no idea what the error means, I just implemented the suggested fix.
 2017-03-24 17:41:14 +01:00