Skip to content
This repository has been archived by the owner on Jun 1, 2021. It is now read-only.

Revive build.properties, remove byte order mark #353

Merged
merged 1 commit into from
Nov 4, 2016

Conversation

magro
Copy link
Contributor

@magro magro commented Nov 2, 2016

The BOM was introduced with commit 2e97ed2. Since then the sbt version in build.properties was ignored (by the sbt launcher), in consequence the sbt launcher's sbt version was used.

If the sbt launcher was now updated to 0.13.13, the warnings described in #351 popped up.

@magro magro changed the title Revive build.properties, remove byte order mark Fix build.properties, update sbt to 0.13.13 & fix sbt deprecation warnings Nov 2, 2016
@krasserm
Copy link
Contributor

krasserm commented Nov 3, 2016

With these changes I see the following Scalariform parser errors for the core module (didn't check others):

[warn] Scalariform parser error for /Users/martin/Development/extern/eventuate/eventuate-core/src/main/scala/com/rbmhtechnology/eventuate/snapshot/filesystem/FilesystemSnapshotStore.scala: Unterminated attribute value
[warn] Scalariform parser error for /Users/martin/Development/extern/eventuate/eventuate-core/src/main/scala/com/rbmhtechnology/eventuate/DurableEvent.scala: Expected token RBRACKET but got Token(XML_START_OPEN,<,5625,<)
[warn] Scalariform parser error for /Users/martin/Development/extern/eventuate/eventuate-core/src/main/scala/com/rbmhtechnology/eventuate/log/BatchingLayer.scala: Expected token RBRACKET but got Token(XML_START_OPEN,<,2667,<)
[warn] Scalariform parser error for /Users/martin/Development/extern/eventuate/eventuate-core/src/main/scala/com/rbmhtechnology/eventuate/log/EventLog.scala: Expected token RBRACKET but got Token(XML_START_OPEN,<,9726,<)

@krasserm
Copy link
Contributor

krasserm commented Nov 3, 2016

These changes have also broken existing functionality:

  • test:compile should automatically run it:compile and multi-jvm:compile (tested that with core/test:compile and crdt/test:compile which didn't include it:compile and multi-jvm:compile.
  • test should automatically run it:test and multi-jvm:test (tested that with crdt/test which ran crdt/test:test but didn't include crdt/it:test. Surprisingly it triggered a crdt/multi-jvm:compile and a crdt/multi-jvm:test)

@magro
Copy link
Contributor Author

magro commented Nov 3, 2016

Thanks for catching this, I'll try to fix it.

@krasserm
Copy link
Contributor

krasserm commented Nov 3, 2016

Thank you! Regarding the Scalariform parser errors, I think this is a pure sbt version issue, has nothing to do with Eventuate's build.sbt.

@magro
Copy link
Contributor Author

magro commented Nov 3, 2016

The triggeredBy is broken due to sbt/sbt#1444. I'll remove the sbt 0.13.13 upgrade from this PR for now.

@magro magro changed the title Fix build.properties, update sbt to 0.13.13 & fix sbt deprecation warnings Revive build.properties, remove byte order mark Nov 3, 2016
The BOM was introduced with commit 2e97ed2. Since then the sbt version
in `build.properties` was ignored (by the sbt launcher), in consequence
the sbt launcher's sbt version was used.

If the sbt launcher was now updated to 0.13.13, the warnings described
in RBMHTechnology#351 popped up.

Resolves RBMHTechnology#351
@krasserm
Copy link
Contributor

krasserm commented Nov 4, 2016

Thanks for the update @magro. The version in build.properties is now picked up as expected:

> inspect sbtVersion
[info] Setting: java.lang.String = 0.13.11

However, I still see the Scalariform parser errors.

@magro
Copy link
Contributor Author

magro commented Nov 4, 2016

Haven't looked at the scalariform stuff, how is this related to this PR? This PR now only intends to fix build.properties, I'd suggest to open another issue for scalariform.

@krasserm
Copy link
Contributor

krasserm commented Nov 4, 2016

It's related to this PR as the Scalariform parser errors do not appear in earlier sbt versions. Anyway, opening another ticket for that is fine. Thanks for the PR, Martin!

@krasserm krasserm merged commit 45cdbf0 into RBMHTechnology:master Nov 4, 2016
@magro
Copy link
Contributor Author

magro commented Nov 4, 2016

You're welcome :-) If time permits I can have a look at #356.

@krasserm krasserm added this to the 0.8 milestone Nov 10, 2016
@magro magro mentioned this pull request Nov 11, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants