Skip to content

Update to sbt-scala-module 1.0.12 #120

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

Merged
merged 1 commit into from
Jul 17, 2017
Merged

Conversation

lrytz
Copy link
Member

@lrytz lrytz commented Jul 7, 2017

Add osgi settings only to the JVM project. In the JS project they
caused the resulting jar to be empty.

Fixes #119

Adds MiMa checking to the JS jar.

Minor cleanups in the build definition.

@lrytz lrytz changed the title Update to sbt-scala-module 1.0.10 Update to sbt-scala-module 1.0.11 Jul 11, 2017
@lrytz lrytz force-pushed the sbt-osgi-0.9.1 branch 4 times, most recently from 62d3150 to 573b876 Compare July 11, 2017 14:15
@lrytz lrytz changed the title Update to sbt-scala-module 1.0.11 Update to sbt-scala-module 1.0.12 Jul 11, 2017
Add osgi settings only to the `JVM` project. In the JS project they
caused the resulting jar to be empty.

Fixes scala#119

Adds MiMa checking to the JS jar.

Minor cleanups in the build definition.
@lrytz
Copy link
Member Author

lrytz commented Jul 11, 2017

@gourlaysama this is ready for review now. Once it's merged we should release 1.0.7.

I tested the fix for #119 locally

$ sbt publishLocal
...
$ unzip -l /Users/luc/.ivy2/local/org.scala-lang.modules/scala-parser-combinators_sjs0.6_2.12/1.0.7-SNAPSHOT/jars/scala-parser-combinators_sjs0.6_2.12.jar
Archive:  /Users/luc/.ivy2/local/org.scala-lang.modules/scala-parser-combinators_sjs0.6_2.12/1.0.7-SNAPSHOT/jars/scala-parser-combinators_sjs0.6_2.12.jar
  Length      Date    Time    Name
---------  ---------- -----   ----
      390  07-11-2017 15:18   META-INF/MANIFEST.MF
...
     2184  07-11-2017 15:18   scala/util/parsing/json/JSONObject$.sjsir
     2784  07-11-2017 15:18   scala/util/parsing/combinator/token/Tokens$ErrorToken$.sjsir
     1404  07-11-2017 15:18   scala/util/parsing/json/JSONType.class
    11781  07-11-2017 15:18   scala/util/parsing/combinator/RegexParsers.class
...

@lrytz lrytz requested a review from gourlaysama July 11, 2017 14:16
@gourlaysama gourlaysama merged commit 8414ba2 into scala:1.0.x Jul 17, 2017
settings(
name := "scala-parser-combinators-root",
repoName := "scala-parser-combinators",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uh, that was probably a mistake from my part, i think it should stay name. the plugin then sets repoName := name.value, which could be overridden if necessary.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't cause harm because the name is picked up from the project name, so you get

> name
[info] scala-parser-combinatorsJS/*:name
[info] 	scala-parser-combinators
[info] scala-parser-combinatorsJVM/*:name
[info] 	scala-parser-combinators

But we should fix it anyway.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@makenowjust
Copy link

Once it's merged we should release 1.0.7.

Why not be 1.0.7 released?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants