[v5.x] Cross-compilation to 2.11, 2.12, 2.13 #815

aslesarenko · 2022-06-28T17:00:11Z

Closes #806

This PR makes code changes necessary for cross-compilation to Scala 2.11, 2.12, 2.13

….6.3

…deps

…CollectionUtil.scala

This reverts commit ae172c5.

…tate-interpreter into kii-2.13-changes

Many changes of ArrayBuffer to ArraySeq

codecov · 2022-09-02T18:01:48Z

Codecov Report

Merging #815 (1912384) into v5.0.4-RC (dab64a3) will decrease coverage by 0.17%.
The diff coverage is 54.89%.

@@              Coverage Diff              @@
##           v5.0.4-RC     #815      +/-   ##
=============================================
- Coverage      76.00%   75.84%   -0.17%     
=============================================
  Files            209      209              
  Lines          13926    13898      -28     
  Branches         468      453      -15     
=============================================
- Hits           10585    10541      -44     
- Misses          3341     3357      +16

Impacted Files	Coverage Δ
common/src/main/scala/scalan/package.scala	`100.00% <ø> (ø)`
common/src/main/scala/scalan/util/GraphUtil.scala	`100.00% <ø> (ø)`
...ommon/src/main/scala/scalan/util/ProcessUtil.scala	`0.00% <0.00%> (ø)`
common/src/main/scala/scalan/util/StringUtil.scala	`47.82% <ø> (ø)`
core/src/main/scala/scalan/Base.scala	`64.55% <0.00%> (ø)`
core/src/main/scala/scalan/MethodCalls.scala	`56.45% <ø> (+1.61%)`	⬆️
...main/scala/scalan/compilation/GraphVizExport.scala	`57.77% <0.00%> (ø)`
...e/src/main/scala/scalan/primitives/Functions.scala	`66.44% <ø> (ø)`
core/src/main/scala/scalan/primitives/Thunks.scala	`59.82% <ø> (ø)`
core/src/main/scala/scalan/staged/AstGraphs.scala	`83.01% <ø> (ø)`
... and 76 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

…' }}

kii-dot · 2022-09-04T04:19:15Z

<3

…2.13 # Conflicts: # sigmastate/src/main/scala/org/ergoplatform/ErgoLikeContext.scala

kushti

You have to get debox dependency reviewed first. And to be reviewed, it should contain description (why forked and what changed).

sigmastate/src/main/scala/sigmastate/basics/BcDlogGroup.scala

build.sbt

sigmastate/src/main/scala/sigmastate/eval/Extensions.scala

sigmastate/src/main/scala/sigmastate/lang/syntax/Basic.scala

sigmastate/src/main/scala/sigmastate/lang/syntax/Literals.scala

sigmastate/src/main/scala/sigmastate/lang/SigmaParser.scala

sigmastate/src/main/scala/sigmastate/lang/Types.scala

sigmastate/src/main/scala/sigmastate/serialization/DataJsonEncoder.scala

sigmastate/src/main/scala/sigmastate/lang/syntax/Core.scala

sigmastate/src/main/scala/sigmastate/lang/syntax/Exprs.scala

sigmastate/src/main/scala/sigmastate/lang/syntax/Identifiers.scala

kushti

I thinking it is good time to add building instructions to readme as well (including how to build for all the supported Scala versions)

common/src/main/scala/scalan/util/CollectionUtil.scala

library/src/main/scala/wrappers/scalan/impl/WRTypesImpl.scala

sigma-library/src/main/scala/special/sigma/impl/SigmaDslImpl.scala

sigmastate/src/main/scala/org/ergoplatform/dsl/ContractSyntax.scala

sigmastate/src/main/scala/org/ergoplatform/validation/ValidationRules.scala

The base branch was changed.

aslesarenko and others added 21 commits May 24, 2022 11:45

v5.x-update-deps: kiama -> 2.5.0

95e19ee

v5.x-update-deps: fastparse -> 2.0.0 (compiles)

ecb3afe

v5.x-update-deps: fastparse -> 2.3.3 (fixed tests except one)

41b8d5b

v5.x-update-deps: fastparse -> 2.3.3 (fixed parser tests)

0f9b3a3

v5.x-update-deps: scalatest -> 3.0.9, scalactic -> 3.0.9, pprint -> 0…

3d499d5

….6.3

v5.x-update-deps: scalameter -> 0.19

d5b73ba

v5.x-update-deps: cfor moved to scalan

f7dc32a

v5.x-update-deps: remove direct dependence on spire

bccd010

v5.x-update-deps: use ScorexFoundation/debox and finish migration of …

4f45c58

…deps

Update Deps: Changed to 2.13

ae172c5

v5.x-update-deps: added scala-collection-compat dependency, migrated …

f965dd8

…CollectionUtil.scala

v5.x-update-deps: mirgated mutable.WrappedArray -> ArraySeq

cffd470

Revert "Update Deps: Changed to 2.13"

9b02bd1

This reverts commit ae172c5.

Merge branch 'v5.x-update-deps' of github.com:ScorexFoundation/sigmas…

b1089c8

…tate-interpreter into kii-2.13-changes

ArrayBuffer to Array Seq

9835526

Many changes of ArrayBuffer to ArraySeq

v5.x-migrage-to-2.13: rollback invalid changes

22801e8

v5.x-migrage-to-2.13: make all tests pass (except SigmaPPrintSpec)

dac1109

v5.x-migrage-to-2.13: fix tests in SigmaPPrintSpec

fc87430

v5.x-migrate-to-2.13: make code compile for 2.11 - 2.13

3b79d12

v5.x-migrate-to-2.13: add 2.13 to CI actions

ab9c57b

v5.x-migrate-to-2.13: add 2.13 to CI actions

d75438c

aslesarenko added 2 commits September 2, 2022 20:40

v5.x-migrate-to-2.13: HAS_SECRETS: ${{ secrets.SONATYPE_PASSWORD != '…

cf4a74c

…' }}

v5.x-migrate-to-2.13: some comments

d42498e

aslesarenko changed the base branch from v5.x-update-deps to v5.x-remove-runtimecosting September 3, 2022 12:45

This was referenced Sep 3, 2022

[v5.0.1] Update dependencies towards Scala 2.13 #807

Closed

Update Dep: 2.13 changes #808

Closed

aslesarenko mentioned this pull request Oct 19, 2022

Roadmap after v5.0 #810

Open

21 tasks

aslesarenko linked an issue Dec 8, 2022 that may be closed by this pull request

Cross-compilation to Scala 2.13 #806

Closed

aslesarenko changed the base branch from v5.x-remove-runtimecosting to v5.0.1-RC December 20, 2022 10:11

aslesarenko added 2 commits December 27, 2022 16:43

Merge remote-tracking branch 'origin/v5.0.1-RC' into v5.x-migrate-to-…

2cdba91

…2.13 # Conflicts: # sigmastate/src/main/scala/org/ergoplatform/ErgoLikeContext.scala

v5.x-migrate-to-2.13: fixes after merge

7ea93e6

aslesarenko changed the base branch from v5.0.1-RC to v5.0.4-RC December 27, 2022 15:54

aslesarenko added 2 commits December 27, 2022 17:58

v5.x-migrate-to-2.13: fixes after merge (build.sbt)

73b4ac4

v5.x-migrate-to-2.13: uncomment test

25c483e

aslesarenko requested a review from kushti December 27, 2022 18:29

kushti requested changes Jan 3, 2023

View reviewed changes

aslesarenko added 4 commits January 13, 2023 10:19

Merge remote-tracking branch 'origin/master' into v5.x-migrate-to-2.13

01983e2

v5.x-migrate-to-2.13: more ScalaDocs

5ec9aed

v5.x-migrate-to-2.13: unused import removed

14de3bb

v5.x-migrate-to-2.13: remove dead code

6e2d6bf

aslesarenko requested a review from kushti January 13, 2023 19:27

kushti requested changes Jan 13, 2023

View reviewed changes

kushti requested changes Jan 17, 2023

View reviewed changes

v5.x-migrate-to-2.13: CONTRIBUTING.md instructions

1912384

aslesarenko requested a review from kushti January 19, 2023 17:26

kushti previously approved these changes Jan 26, 2023

View reviewed changes

aslesarenko changed the base branch from v5.0.4-RC to master January 26, 2023 20:03

aslesarenko merged commit dce7705 into master Jan 26, 2023

aslesarenko mentioned this pull request Apr 25, 2023

Cross-compilation to Scala 2.13 #806

Closed

aslesarenko deleted the v5.x-migrate-to-2.13 branch May 1, 2024 15:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[v5.x] Cross-compilation to 2.11, 2.12, 2.13 #815

[v5.x] Cross-compilation to 2.11, 2.12, 2.13 #815

aslesarenko commented Jun 28, 2022 •

edited

codecov bot commented Sep 2, 2022 •

edited

kii-dot commented Sep 4, 2022

kushti left a comment

kushti left a comment

[v5.x] Cross-compilation to 2.11, 2.12, 2.13 #815

[v5.x] Cross-compilation to 2.11, 2.12, 2.13 #815

Conversation

aslesarenko commented Jun 28, 2022 • edited

codecov bot commented Sep 2, 2022 • edited

Codecov Report

kii-dot commented Sep 4, 2022

kushti left a comment

Choose a reason for hiding this comment

kushti left a comment

Choose a reason for hiding this comment

aslesarenko commented Jun 28, 2022 •

edited

codecov bot commented Sep 2, 2022 •

edited