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.

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

Poc #3

Merged
merged 27 commits into from
Apr 28, 2021
Merged

Poc #3

merged 27 commits into from
Apr 28, 2021

Conversation

HubertBalcerzak
Copy link
Contributor

No description provided.

build.sbt Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
@PawelLipski
Copy link
Collaborator

As a general rule, pls mark the comments as resolved once they're ready ✅

build.sbt Outdated Show resolved Hide resolved
build.sbt Show resolved Hide resolved
build.sbt Show resolved Hide resolved
import sbt._

object Dependencies {
val borerVersion = "1.6.3"
Copy link
Collaborator

Choose a reason for hiding this comment

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

There's already Borer 1.7.0 AFAICS

Copy link
Collaborator

Choose a reason for hiding this comment

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

Or now 1.7.1 with #16 fixed ;)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Whoops looks that 1.7+ is only for Scala 2.13... lemme discuss with the Borer author...

Copy link
Collaborator

Choose a reason for hiding this comment

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

Or maybe I'll manage to migrate Hydra to 2.13 right now, lemme see :trollface:

import io.bullet.borer.Codec

import java.io.{ByteArrayInputStream, ByteArrayOutputStream, ObjectInputStream, ObjectOutputStream}
import java.time.OffsetDateTime

object StandardCodecs {

implicit def sinkRefCodec[T](implicit system: actor.ActorSystem = serializationSystem): Codec[SinkRef[T]] = {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Gr8, lemme quickly check on my commercial project (let's codename it Hydra from now on...)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Whoops I'm blocked on this problem with type aliases (since borer 1.7.1 is not yet available for Scala 2.12, only 2.13)... let's leave as is for now

@PawelLipski
Copy link
Collaborator

This PR's got pretty big, pls resolve the outstanding issues (esp. the CI build) and merge this one to master

@PawelLipski
Copy link
Collaborator

(and open new PRs for new stuff)

@PawelLipski PawelLipski linked an issue Apr 27, 2021 that may be closed by this pull request
@PawelLipski
Copy link
Collaborator

Approving, but subject to fixing the tests 🤔

@MarconZet
Copy link
Collaborator

@PawelLipski should we use squash and merge, or rebase and merge?

@PawelLipski
Copy link
Collaborator

As you like, as long as the history of master is linear (or near-linear, when accounting for hotfixes, see http://slides.com/plipski/git-machete#/11)

@PawelLipski
Copy link
Collaborator

PawelLipski commented Apr 28, 2021

Typically I'm using just git checkout master && git merge --ff-only poc && git push -u origin master, so all from CLI (clicking no button in GH web), basically fast-forwarding (repointing) master to match the branch

@PawelLipski
Copy link
Collaborator

(FF merge gives the most predictable effects, as no new commit is created by GitHub behind the scenes, as would be the case with button-triggered Rebase or Squash)

@MarconZet
Copy link
Collaborator

remote: error: GH006: Protected branch update failed for refs/heads/main.
remote: error: This branch must not contain merge commits.

It seems we have used a merge once by accident. Untangling this will require some work.

@PawelLipski
Copy link
Collaborator

Ok than use squash button from web GH, this should not have this problem

@MarconZet MarconZet merged commit 1cad34c into main Apr 28, 2021
@MarconZet MarconZet deleted the poc branch April 28, 2021 10:21
@PawelLipski PawelLipski linked an issue Apr 28, 2021 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provide a Borer codec for akka.stream.SourceRef Add dependency on borer-compat-akka
3 participants