[ETCM-129] Scala 2.13 #875
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmitry-worker
force-pushed
the
feature/ETCM-129-scala-point-13
branch
from
015dd00 to
4b2beab
Compare
dmitry-worker
force-pushed
the
feature/ETCM-129-scala-point-13
branch
from
185db23 to
e9089fe
Compare
dmitry-worker
requested review from
lemastero,
biandratti,
enriquerodbe and
faraggi
lemastero
reviewed
Jan 4, 2021
lemastero
reviewed
Jan 4, 2021
enriquerodbe
reviewed
Jan 4, 2021
bytes/src/test/scala/io/iohk/ethereum/utils/ByteStringUtilsTest.scala
Outdated
Show resolved
Hide resolved
bytes/src/test/scala/io/iohk/ethereum/utils/ByteStringUtilsTest.scala
Outdated
Show resolved
Hide resolved
crypto/src/main/scala/io/iohk/ethereum/crypto/ECDSASignature.scala
Outdated
Show resolved
Hide resolved
src/main/scala/io/iohk/ethereum/blockchain/sync/fast/SyncStateScheduler.scala
Show resolved
Hide resolved
src/main/scala/io/iohk/ethereum/db/storage/CachedKeyValueStorage.scala
Outdated
Show resolved
Hide resolved
src/main/scala/io/iohk/ethereum/network/rlpx/AuthInitiateMessage.scala
Outdated
Show resolved
Hide resolved
lemastero
suggested changes
Jan 5, 2021
lemastero
reviewed
Jan 5, 2021
repo.nix
Outdated
| sha256 = "44CEF93345FA7A12EB1830F7D7AA9881EAB09D87B5E1E4D10608CECDCC53258B"; | ||
| "nix-local-preloaded/file:/var/lib/buildkite-agent/.sbtix/preloaded/com/google/protobuf/protobuf-java/3.7.0/protobuf-java-3.7.0-sources.jar" = { | ||
| url = "file:/var/lib/buildkite-agent/.sbtix/preloaded/com/google/protobuf/protobuf-java/3.7.0/protobuf-java-3.7.0-sources.jar"; | ||
| sha256 = "116ADC64F2E67A9F2961C410B1FBE029447C4B39C62F6AE93797989E38C85B83"; |
There was a problem hiding this comment.
protobufs paths were changes from relative:
"nix-public/com/google/protobuf/protobuf-java/3.4.0/protobuf-java-3.4.0-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.4.0/protobuf-java-3.4.0-javadoc.jar";
sha256 = "AD810CD0D6786E656C8BF3C0EA9851BCD3FBA2CCBC1E803326B4012BE0943D19";
};
to absolute:
url = "file:/var/lib/buildkite-agent/.sbtix/preloaded/com/google/protobuf/protobuf-java/3.7.0/protobuf-java-3.7.0-sources.jar";
This needs to be investigated. This caused issues in the past.
There was a problem hiding this comment.
Good catch! I will arrange a call about that also
There was a problem hiding this comment.
sbt was updated in the past, and it was downgraded because it generated local paths: https://github.com/input-output-hk/mantis/pull/708/files
Maybe restoring sbt version would fix this.
There was a problem hiding this comment.
I guess it is not an sbt but an sbtix failure? WDYT?
enriquerodbe
approved these changes
Jan 5, 2021
|
IMHO it would be good to cherry-pick changes and make separate PR's:
Modular changes are easier to revert in case we need to and are easier to review. |
…oint-13-ringer Fix scala==2.13 nix build, cleanup
Use only jdk8 when building nix
biandratti
pushed a commit
that referenced
this pull request
Jan 20, 2021
* [ETCM-129] - Migrate to 2.13 Co-authored-by: dmitry-worker <dzenmassta@gmail.com> Co-authored-by: Jonathan Ringer <jonathan.ringer@iohk.io> Guided by: Piotr Paradzinski <piotr.paradzinski@iohk.io> Reviewed by: Enrique Rodríguez <enrique.rodriguez@iohk.io> Dependencies upgrade guide: Akosh Farkash <akosh.farkash@iohk.io>
biandratti
pushed a commit
that referenced
this pull request
Jan 20, 2021
* [ETCM-129] - Migrate to 2.13 Co-authored-by: dmitry-worker <dzenmassta@gmail.com> Co-authored-by: Jonathan Ringer <jonathan.ringer@iohk.io> Guided by: Piotr Paradzinski <piotr.paradzinski@iohk.io> Reviewed by: Enrique Rodríguez <enrique.rodriguez@iohk.io> Dependencies upgrade guide: Akosh Farkash <akosh.farkash@iohk.io>
biandratti
pushed a commit
that referenced
this pull request
Jan 20, 2021
* [ETCM-129] - Migrate to 2.13 Co-authored-by: dmitry-worker <dzenmassta@gmail.com> Co-authored-by: Jonathan Ringer <jonathan.ringer@iohk.io> Guided by: Piotr Paradzinski <piotr.paradzinski@iohk.io> Reviewed by: Enrique Rodríguez <enrique.rodriguez@iohk.io> Dependencies upgrade guide: Akosh Farkash <akosh.farkash@iohk.io>
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Completed 2.13 scala migration