-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
support sbt 1.0.0-RC3 #49
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow thanks! Here I thought I knew what I was going to do tomorrow, but now it's all done!
I have a few remarks below.
project/Extra.scala
Outdated
_.key.key.label == libraryDependencies.key.label) ++ Seq( | ||
// https://github.com/sbt/sbt/issues/3325 | ||
libraryDependencies ++= { | ||
CrossVersion.binarySbtVersion(scriptedSbt.value) match { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
formatted by scalafmt :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$HERE/.coursier bootstrap com.geirsson:scalafmt-cli_2.11:0.4.7 --main org.scalafmt.cli.Cli -o $HERE/.scalafmt
Should we use latest version of scalafmt?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it fixes the indentation problem here, I would say yes.
.travis.yml
Outdated
@@ -69,6 +69,7 @@ before_script: | |||
script: | |||
- java -version | |||
- bin/scalafmt --test && sbt sbt-crossproject-test/scripted | |||
- sbt "^^ 1.0.0-RC2" sbt-crossproject/compile |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you make it sbt-crossproject/publishLocal
so that we make sure that all the artifacts necessary for online publishing will work? In my experience generating documentation can often break while the rest passes, under -Xfatal-warnings
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
@@ -0,0 +1,6 @@ | |||
package sbt |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We really should not put anything in the sbt
package. There's no excuse for this. Other plugins could be tempted to do the same, and then you have the same class defined twice on the classpath.
IIRC that method, StringUtilities.nonEmpty
, was very short. I suggest to copy it and integrate it as private inside sbt-crossproject, and stop using the one coming from sbt.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with you. I will update 🙆♂️
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
project/Extra.scala
Outdated
val sbtPluginSettings = ScriptedPlugin.scriptedSettings ++ Seq( | ||
val sbtPluginSettings = ScriptedPlugin.scriptedSettings.filterNot( | ||
_.key.key.label == libraryDependencies.key.label) ++ Seq( | ||
// https://github.com/sbt/sbt/issues/3325 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure I understand what's going on, here? Is the workaround implemented here sufficient to get scripted to work with 1.0.0-RC2? If yes, why doesn't .travis.yml run scripted for the plugin under 1.0.0-RC2? If not, what is the purpose of these settings here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't execute scripted tests because sbt-crossproject-test
and sbt-scalajs-crossproject
depends on "org.scala-js" % "sbt-scalajs" % "0.6.16"
which does not support sbt 1.0.0-RC2.
Is the workaround implemented here sufficient to get scripted to work with 1.0.0-RC2
You’re almost right. but without this workaround, sbt throw scala.MatchError
when just execute sbt "^^ 1.0.0-RC2"
not scripted
.
BTW, sbt-crossproject
does not have scripted tests yet. Should we remove scripted tests settings from
sbt-crossproject
? This workaround unnecessary if remove scripted tests settings from
sbt-crossproject
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK that makes sense.
I will let @densh decide whether removing the scripted settings from sbt-crossproject
makes sense. I am not too familiar with the consequences here.
Apart from the scalafmt thing, it's good for me :) @densh should have a final look at it. |
project/build.properties
Outdated
@@ -1 +1 @@ | |||
sbt.version=0.13.15 | |||
sbt.version=0.13.16-M1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sbt 0.13.16 final has been published. Could you amend your PR to use that version, please?
9d09c01
to
87c4950
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Ping @densh. We'll need this to be able to merge 0.6.x into master in the Scala.js repo. |
LGTM, thanks @xuwei-k ! 👍 |
@sjrd Yep, thanks for the heads up! |
Thanks! Could I also get a release, please? |
#48