Skip to content
This repository was archived by the owner on Jan 28, 2024. It is now read-only.

Merge branch 'dart-dev' into 'master'. #154

Closed
wants to merge 13 commits into from

Conversation

mannprerak2
Copy link
Contributor

mannprerak2 and others added 12 commits January 7, 2021 20:02
* Added support for structs by value, fixed tests and example
* updated version, readme, changelog
* Added more tests
* Added struct return by value to native test
* Fix struct by value in nested typedefs
* Removed the usage of --no-sound-null-safety, updated version, changelog

* Add include path for systems with LLVM 11 (e.g. Debian 11) (dart-archive#125)

* Removed usage of --no-sound-null-safety flag. (dart-archive#136)

* Removed usage of --no-sound-null-safety flag
* Update version, changelog
* Use flag when running tests on travis

Co-authored-by: J-P Nurmi <[email protected]>
* Use Opaque to represent empty structs, updated tests, changelog, version
* Updated code_generator_tests

* Throw exception if formatting fails

* minor change
We can mark ourselves as no longer experimental.
* Updated package:quiver version
Copy link
Contributor

@dcharkes dcharkes left a comment

Choose a reason for hiding this comment

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

lgtm

@dcharkes
Copy link
Contributor

I prefer to not squash this one, because we already squashed the individual feature PRs on the dart-dev branch.

@mit-mit @athomas any objections?

@mit-mit
Copy link
Contributor

mit-mit commented Feb 24, 2021

I don't have a lot of context here, so hard to comment. The preferred solution is a set of small targeted PRs, each of which can then be squashed.

@dcharkes
Copy link
Contributor

We've been extending this package based on new dart:ffi features being available on the Dart dev and beta releases on this branch. The master branch has been behind (no support for structs by value, nested structs, breaking API changes etc.)

We've made package:ffi pre-releases from this branch. If we squash and merge, we lose the source history for those releases. (I presume the pre-releases themselves are backed up on pub.dev itself.)

@mit-mit
Copy link
Contributor

mit-mit commented Feb 24, 2021

Could we bring the changes over in a set of feature-based PRs?

@dcharkes
Copy link
Contributor

We could, but this would be a recurring issue every stable release.

  1. We have a stable version of the package that uses the last Dart stable release and someone makes a PR for that.
  2. We have a dev version of the package that uses the last Dart dev release (including new dart:ffi features) and someone makes a PR for that.

And then every stable release, we would have to redo all the PRs from the dev branch to the stable branch. Wouldn't it be cleaner to have just a merge from dev to stable every Dart stable release?

@mannprerak2
Copy link
Contributor Author

@dcharkes Should I squash the last 2 commits into 1 commit?

@dcharkes
Copy link
Contributor

Alternative approach as suggested by @mit is to have the master branch track dart dev releases and do all the PRs there. And then when we make a stable release make the master branch track dart stable (or beta).

As for getting this work on to the master branch, we could make individual PRs grouping commits on this branch.

@dcharkes
Copy link
Contributor

After discussing with @natebosch, we came up with this: https://github.com/dart-lang/ffigen/wiki/Branches.

@dcharkes
Copy link
Contributor

dcharkes commented Mar 1, 2021

Done in separate PRs.

@dcharkes dcharkes closed this Mar 1, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Merge dart-dev into master
4 participants