Skip to content
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.

Sign up for GitHub

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

Jump to bottom

add support for -Xsource:3 testkit input & output #1666

Merged
merged 2 commits into from Jan 21, 2024
Merged

add support for -Xsource:3 testkit input & output #1666

merged 2 commits into from Jan 21, 2024

Conversation

bjaglin
Copy link
Collaborator

@bjaglin bjaglin commented Sep 10, 2022 •
edited

Follows #1664 (review)

This adds adds some complexity in the inter-project lookup mechanism so that some projects introduced in #1756 can be removed, in order to reduce (almost cancel) the extra build cardinality introduced by this PR .

--- main
+++ this PR
-[info] resolving key references (53896 settings) ...
+[info] resolving key references (56220 settings) ...
 sbt:scalafix> projects
 [info] In file:/home/brice/git/scala/scalafix/
 [info] 	   cli2_12
 [info] 	   cli2_13
 [info] 	   cli3
 [info] 	   core2_12
 [info] 	   core2_13
 [info] 	   core3
 [info] 	   docs2_13
 [info] 	   expect2_12Target2_12_16
 [info] 	   expect2_12Target2_12_17
 [info] 	   expect2_12Target2_12_18
+[info] 	   expect2_12Target2_12_18xsource3
 [info] 	   expect2_12Target3_3_1
 [info] 	   expect2_13Target2_13_10
 [info] 	   expect2_13Target2_13_11
 [info] 	   expect2_13Target2_13_12
+[info] 	   expect2_13Target2_13_12xsource3
 [info] 	   expect2_13Target3_3_1
 [info] 	   expect3Target3_3_1
 [info] 	   input2_12_16
 [info] 	   input2_12_17
 [info] 	   input2_12_18
+[info] 	   input2_12_18xsource3
 [info] 	   input2_13_10
 [info] 	   input2_13_11
 [info] 	   input2_13_12
+[info] 	   input2_13_12xsource3
 [info] 	   input3_3_1
 [info] 	   integration2_12
 [info] 	   integration2_13
 [info] 	   integration3
 [info] 	   interfaces
-[info] 	   output2_12
+[info] 	   output2_12_18
+[info] 	   output2_12_18xsource3
-[info] 	   output2_13
+[info] 	   output2_13_12
+[info] 	   output2_13_12xsource3
-[info] 	   output3
+[info] 	   output3_3_1
 [info] 	   reflect2_12
 [info] 	   reflect2_13
 [info] 	   reflect3
 [info] 	   rules2_13
 [info] 	   rules3
 [info] 	 * scalafix
-[info] 	   shared2_12_16
-[info] 	   shared2_12_17
-[info] 	   shared2_12_18
+[info] 	   shared2_12
-[info] 	   shared2_13_10
-[info] 	   shared2_13_11
-[info] 	   shared2_13_12
+[info] 	   shared2_13
-[info] 	   shared3_3_1
+[info] 	   shared3
 [info] 	   testkit2_12
 [info] 	   testkit2_13
 [info] 	   testkit3
 [info] 	   unit2_12
 [info] 	   unit2_13
 [info] 	   unit3

@bjaglin bjaglin mentioned this pull request Sep 10, 2022
Merged
@bjaglin bjaglin changed the title add support for -Xsource:3 testkit input & ouptut add support for -Xsource:3 testkit input & outptut Sep 10, 2022
@bjaglin bjaglin changed the title add support for -Xsource:3 testkit input & outptut add support for -Xsource:3 testkit input & output Sep 10, 2022
bjaglin
bjaglin commented Sep 10, 2022
View reviewed changes
CONTRIBUTING.md Outdated Show resolved Hide resolved
bjaglin
bjaglin commented Sep 10, 2022
View reviewed changes
build.sbt Outdated Show resolved Hide resolved
@bjaglin bjaglin force-pushed the xsource3 branch 3 times, most recently from 82149f7 to a5dc1e9 Compare September 10, 2022 20:15
@bjaglin bjaglin marked this pull request as ready for review September 10, 2022 20:28
bjaglin
bjaglin commented Sep 10, 2022
View reviewed changes
project/ScalafixBuild.scala Outdated
Comment on lines 73 to 74
Compile / unmanagedSourceDirectories :=
((Compile / sourceDirectory).value * "*xsource3").get
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Not particular proud about that. For sure, it would be more maintainable to have a dedicated inputSource3 project with a sources in the regular scala, but I haven't found a way to integrate that in the unit matrix without duplicating the entire testkit properties setup.

@bjaglin bjaglin mentioned this pull request Oct 18, 2022
Merged
@SethTisue
Copy link
Contributor

Curious (mildly) if something is blocking this, or if just sort of got forgotten about.

@bjaglin
Copy link
Collaborator Author

bjaglin commented Mar 19, 2023

Curious (mildly) if something is blocking this, or if just sort of got forgotten about.

I am not very happy about the solution. so I want to park that for a while to see if the added complexity in the build was worth it, particularly in the context of #1480.

@bjaglin
Copy link
Collaborator Author

bjaglin commented May 15, 2023 •
edited

Big conflicts with #1756 ahead

@bjaglin bjaglin force-pushed the xsource3 branch 3 times, most recently from d91ac05 to 461c741 Compare June 12, 2023 23:05
@bjaglin bjaglin marked this pull request as draft July 1, 2023 00:20
@bjaglin
Copy link
Collaborator Author

bjaglin commented Jul 1, 2023 •
edited

Still iterating on this locally after rebasing against main, as I am not satisfied by the number of extra projects this brings - shared should only have one instance per scala binary version

sbt:scalafix> projects
[info] In file:/home/brice/git/scalafix/
[info] 	   cli2_12
[info] 	   cli2_13
[info] 	   cli3
[info] 	   core2_12
[info] 	   core2_13
[info] 	   core3
[info] 	   docs2_13
[info] 	   expect2_12Target2_12_16
[info] 	   expect2_12Target2_12_17
[info] 	   expect2_12Target2_12_18
[info] 	   expect2_12Target2_12_18xsource3
[info] 	   expect2_12Target3_3_1-RC1
[info] 	   expect2_13Target2_13_10
[info] 	   expect2_13Target2_13_11
[info] 	   expect2_13Target2_13_11xsource3
[info] 	   expect2_13Target2_13_9
[info] 	   expect2_13Target3_3_1-RC1
[info] 	   expect3Target3_3_1-RC1
[info] 	   input2_12_16
[info] 	   input2_12_17
[info] 	   input2_12_18
[info] 	   input2_12_18xsource3
[info] 	   input2_13_10
[info] 	   input2_13_11
[info] 	   input2_13_11xsource3
[info] 	   input2_13_9
[info] 	   input3_3_1_RC1
[info] 	   integration2_12
[info] 	   integration2_13
[info] 	   integration3
[info] 	   interfaces
[info] 	   output2_12_16
[info] 	   output2_12_17
[info] 	   output2_12_18
[info] 	   output2_12_18xsource3
[info] 	   output2_13_10
[info] 	   output2_13_11
[info] 	   output2_13_11xsource3
[info] 	   output2_13_9
[info] 	   output3_3_1_RC1
[info] 	   reflect2_12
[info] 	   reflect2_13
[info] 	   reflect3
[info] 	   rules2_12
[info] 	   rules2_13
[info] 	   rules3
[info] 	 * scalafix
[info] 	   shared2_12_16
[info] 	   shared2_12_17
[info] 	   shared2_12_18
[info] 	   shared2_12_18xsource3
[info] 	   shared2_13_10
[info] 	   shared2_13_11
[info] 	   shared2_13_11xsource3
[info] 	   shared2_13_9
[info] 	   shared3_3_1_RC1
[info] 	   testkit2_12
[info] 	   testkit2_13
[info] 	   testkit3
[info] 	   unit2_12
[info] 	   unit2_13
[info] 	   unit3

@bjaglin bjaglin force-pushed the xsource3 branch 6 times, most recently from ca93f83 to b42b366 Compare January 21, 2024 22:15
@bjaglin bjaglin marked this pull request as ready for review January 21, 2024 22:17
@bjaglin bjaglin merged commit 8984220 into scalacenter:main Jan 21, 2024
8 checks passed
@bjaglin bjaglin mentioned this pull request Jan 21, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mlachkar mlachkar mlachkar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bjaglin @SethTisue @mlachkar