Migrate to sbt-typelevel #2857

armanbilge · 2022-03-03T18:36:42Z

Taking the conservative approach and not mixing up the build too much with sbt-typelevel gospel 😉

Opening for CI. I anticipate this PR will fail while we get MiMa up-to-speed on Scala 3 and possible Scala.js.

build.sbt

armanbilge · 2022-03-03T18:38:04Z

.github/workflows/ci.yml

+    tags: [v*]

 env:
+  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
+  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+  PGP_SECRET: ${{ secrets.PGP_SECRET }}


Hmm, I guess these are baked in a little too hard :) anyway should be harmless.

Bleh. :-) I'd definitely like to see these cleaned up, but it's kind of okay for now.

armanbilge · 2022-03-03T18:39:03Z

build.sbt

-ThisBuild / githubWorkflowBuildMatrixExclusions ++= {
+ThisBuild / githubWorkflowBuildMatrixExclusions := {


sbt-typelevel already does some of these exclusions for us. Rather than tease apart what's been upstreamed we'll just keep using our own.

We shoudl try to inherit more in the future, but this is a fine start.

project/Common.scala

armanbilge · 2022-03-03T19:20:11Z

I just added like a 100+ mima filters. At a glance they all seem reasonable but would be good for someone to look with a more careful eye.

armanbilge · 2022-03-03T20:13:26Z

build.sbt

 ThisBuild / tlBaseVersion := "3.3"
+ThisBuild / tlUntaggedAreSnapshots := false


I almost forgot 😆

djspiewak

Btw I do agree with the reformattings, but why are they happening as part of this PR?

djspiewak · 2022-03-04T17:44:35Z

build.sbt


 val OldGuardJava = JavaSpec.temurin("8")
 val LTSJava = JavaSpec.temurin("11")
 val LatestJava = JavaSpec.temurin("17")
 val ScalaJSJava = OldGuardJava
-val GraalVM = JavaSpec.graalvm("21.3.0", "11")
+val GraalVM = JavaSpec.graalvm("11")


Why is the Graal version not specified. This feels a little weird in general since it suggests that the GraalVM version would be either unstable or unconfigurable.

I can revert this. Most people probably want the latest Graal and not a specific version (which is easy to forget to update, as we've forgotten to here :)

Btw @vasilmkd what are your thoughts on this topic, maybe we need to revise the JDK index to support this?

We were already on latest, I was doing it manually. Graalvm also follows the JDK release cycle, so as soon as the latest drops, the previous one is obsolete and unsupported. I don't want to sound dismissive, but I'm not interested in changing the index to support old versions.

I see the latest in the index is 22.0.0.2 and CE is on 21.3.0, so we've fallen behind again (at least on this branch).

Ok @djspiewak your call, how do you want to configure this for CE?

version would be either unstable

It depends on what you are targeting. If you are targeting JDK whatever then shouldn't it be as stable as any of the other JVMs?

OTOH, if you are targeting specific GraalVM APIs then obviously it makes a difference. Actually I have a project like this.

FTR I didn't remove the ability to configure a specific GraalVM (it still shells out to DeLaGuardo/setup-graalvm like you set it up) although it is now a little more "discouraged" because I expect 99% of projects don't actually want this.

Finally, if you truly want stability, you should really pin the JDK index to a particular hash anyway :)

build.sbt

project/Common.scala

djspiewak · 2022-03-04T17:46:55Z

.github/workflows/ci.yml

+    tags: [v*]

 env:
+  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
+  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+  PGP_SECRET: ${{ secrets.PGP_SECRET }}


Bleh. :-) I'd definitely like to see these cleaned up, but it's kind of okay for now.

.github/workflows/ci.yml

armanbilge · 2022-03-04T17:58:37Z

Formatting changes are probably because sbt-typelevel brings you latest sbt-scalafmt which this branch missed.

Update sbt-scalafmt to 2.4.6 in series/3.x #2690

which includes a fix for:

shared/ sources for cross-platform projects ignored in 2.4.5 scalameta/sbt-scalafmt#190

This reverts commit e1aae6d.

vasilmkd · 2022-03-11T20:52:27Z

In light of scala/scala3#14624 and scala/scala3#14662, I think we can go ahead and apply the MiMa filters for the Scala 3 issue.

armanbilge · 2022-03-11T20:54:22Z

After this PR merges, I'll do a follow-up which adds JDK17/Scala3 to CI. That will force us to add the mima filters.

…ypelevel

djspiewak · 2022-04-02T05:46:34Z

show version
3.3.9-18-b0b4a99-20220402T054540Z-SNAPSHOT

How do I make it stop? :-( Worktrees do seem to work though.

armanbilge · 2022-04-02T09:14:52Z

Cool! So not a blocker ... right? 😇

djspiewak · 2022-04-02T16:28:19Z

LOL. Well, I really want to make that version stuff at least configurable, because the transitive impact it has on the ecosystem is… unpleasant. Not a hard blocker, but definitely a something. I'll see if I can fix it myself in sbt-tl

djspiewak · 2022-04-02T16:34:37Z

Oh, it's more sbt-git issues:

sbt:root> show gitUncommittedChanges
[info] benchmarks / gitUncommittedChanges
[info] 	true
[info] testsJVM / gitUncommittedChanges
[info] 	true

There are no uncommitted changes.

djspiewak · 2022-04-02T17:10:28Z

Alright, managed to get it working, sort of. 3.3.9-20-44bf4e1 has been published to sonatype so we can make sure things are in good shape. I published it using Java 11, fwiw, so we can test the release flag while we're at it.

Basically, we needed one last fix for sbt-git which I completely forgot about. Namely, they're determining dirty directories incorrectly (by using git status and then grepping for text). This has issues between different versions of git, and so the workaround is to use git status -s and check to see if it returns any results.

djspiewak · 2022-04-02T18:23:54Z

Release looks good. Branch appears to be generally functional. I'm in favor of merging this, though it would be nice to see the sbt-git workaround upstreamed at some point.

vasilmkd · 2022-04-02T18:40:47Z

Let's go! 🚀

armanbilge · 2022-04-02T19:20:33Z

🎉 I wasn't sure if we'd make it 😂 thank you! Obviously still plenty to upstream 😬

Migrate to sbt-typelevel

dfa10d1

armanbilge commented Mar 3, 2022

View reviewed changes

armanbilge added 5 commits March 3, 2022 18:41

formatting

b46b7ed

Scala 3 joined us in 3.1.1

190aff5

Actually check MiMa on JS :)

e419eff

Add shittone mima filters

fc1b9ed

Set target JDK to 8

9706fcf

Remove rogue javac flags

226dc55

armanbilge mentioned this pull request Mar 3, 2022

sbt-typelevel adoption typelevel/sbt-typelevel#83

Open

44 tasks

armanbilge marked this pull request as ready for review March 3, 2022 20:08

One last spiewak-ism

c402a52

armanbilge commented Mar 3, 2022

View reviewed changes

djspiewak requested changes Mar 4, 2022

View reviewed changes

djspiewak reviewed Mar 4, 2022

View reviewed changes

.github/workflows/ci.yml Show resolved Hide resolved

armanbilge and others added 4 commits March 4, 2022 18:40

Use s01 for publishing

e4b8afc

Debugging

e1aae6d

Revert "Debugging"

1cf00a0

This reverts commit e1aae6d.

Added release alias

b6f95d6

djspiewak mentioned this pull request Mar 7, 2022

Added publish settings autoplugin #2860

Merged

vasilmkd mentioned this pull request Mar 9, 2022

Use Java release option #2825

Closed

This was referenced Mar 14, 2022

Don't include publishing-related secrets if there is no publish job typelevel/sbt-typelevel#212

Closed

Automatically filter package-private changes on Scala 3 lightbend-labs/mima#682

Closed

armanbilge added 4 commits March 29, 2022 15:37

Merge remote-tracking branch 'upstream/series/3.3.x' into topic/sbt-t…

4bc1595

…ypelevel

Update to sbt-typelevel 0.5.0-M1

d36af8e

Enable new useConsoleForROGit setting

d3659d0

Formatting

b0b4a99

djspiewak added 2 commits April 2, 2022 10:52

Attempting to fix uncommitted changes

2d1dc57

Added some missing mima filters

44bf4e1

djspiewak approved these changes Apr 2, 2022

View reviewed changes

vasilmkd approved these changes Apr 2, 2022

View reviewed changes

armanbilge merged commit 794c85d into typelevel:series/3.3.x Apr 2, 2022

armanbilge mentioned this pull request Apr 21, 2022

Add Scala3 / JDK17 job to CI #2969

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate to sbt-typelevel #2857

Migrate to sbt-typelevel #2857

armanbilge commented Mar 3, 2022

armanbilge Mar 3, 2022

djspiewak Mar 4, 2022

armanbilge Mar 3, 2022

djspiewak Apr 2, 2022

armanbilge commented Mar 3, 2022

armanbilge Mar 3, 2022

djspiewak left a comment

djspiewak Mar 4, 2022

armanbilge Mar 4, 2022

armanbilge Mar 4, 2022

vasilmkd Mar 4, 2022

armanbilge Mar 4, 2022

djspiewak Mar 4, 2022

armanbilge commented Mar 4, 2022

vasilmkd commented Mar 11, 2022

armanbilge commented Mar 11, 2022

djspiewak commented Apr 2, 2022

armanbilge commented Apr 2, 2022

djspiewak commented Apr 2, 2022

djspiewak commented Apr 2, 2022 •

edited

Loading

djspiewak commented Apr 2, 2022

djspiewak commented Apr 2, 2022

vasilmkd commented Apr 2, 2022

armanbilge commented Apr 2, 2022

		ThisBuild / githubWorkflowBuildMatrixExclusions ++= {
		ThisBuild / githubWorkflowBuildMatrixExclusions := {

		ThisBuild / tlBaseVersion := "3.3"
		ThisBuild / tlUntaggedAreSnapshots := false

Migrate to sbt-typelevel #2857

Migrate to sbt-typelevel #2857

Conversation

armanbilge commented Mar 3, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

armanbilge commented Mar 3, 2022

Choose a reason for hiding this comment

djspiewak left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

armanbilge commented Mar 4, 2022

vasilmkd commented Mar 11, 2022

armanbilge commented Mar 11, 2022

djspiewak commented Apr 2, 2022

armanbilge commented Apr 2, 2022

djspiewak commented Apr 2, 2022

djspiewak commented Apr 2, 2022 • edited Loading

djspiewak commented Apr 2, 2022

djspiewak commented Apr 2, 2022

vasilmkd commented Apr 2, 2022

armanbilge commented Apr 2, 2022

djspiewak commented Apr 2, 2022 •

edited

Loading