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

Merge jnigen #545

Merged
merged 141 commits into from
Nov 17, 2023
Merged

Merge jnigen #545

merged 141 commits into from
Nov 17, 2023

Conversation

HosseinYousefi
Copy link
Member

@HosseinYousefi HosseinYousefi commented Nov 16, 2023

Caution

Do NOT squash merge!

Followed the instructions from dart-lang/tools#100.
Closes #555.

History change commands:

  1. Move everything to pkgs/
git filter-repo --path-rename :pkgs/
  1. Remove AUTHORS and LICENSE files as they already exist.
git filter-repo --path pkgs/AUTHORS --path pkgs/LICENSE --invert-paths
  1. Use top-level readme as package:jnigen's readme and remove the top-level one.
git filter-repo --path pkgs/jnigen/README.md --invert-path
git filter-repo --path-rename-match pkgs/README.md:pkgs/jnigen/README.md
  1. Move .github related files to their correct path and remove existing files.
git filter-repo --path-rename-match pkgs/.github/:.github/
git filter-repo --path .github/dependabot.yaml --path .github/workflows/publish.yaml --invert-path
  1. Change the workflow name.
git filter-repo --path-rename-match .github/workflows/test-package.yaml:.github/workflows/jnigen.yaml
  1. Apply some minor changes to paths inside the workflow.
git filter-repo --replace-text textreplacement

Content of textreplacement:

working-directory: ./==>working-directory: ./pkgs/
path-to-lcov: ./==>path-to-lcov: ./pkgs/
  1. Add [jnigen] to the beginning of every commit message and change the issue/PR numbers to the correct link in the jnigen repo.
git filter-repo --replace-message msgreplacement

Content of msgreplacement:

regex:^==>[jnigen] 
[jnigen] [jnigen] ==>[jnigen] 
regex:#(\d+)==>https://github.com/dart-lang/jnigen/issues/\1

 * [new tag]           jni-v0.6.0 -> jni-v0.6.0
 * [new tag]           jni-v0.7.0 -> jni-v0.7.0
 * [new tag]           jnigen-v0.6.0 -> jnigen-v0.6.0
 * [new tag]           jnigen-v0.7.0 -> jnigen-v0.7.0

dcharkes and others added 30 commits May 31, 2022 11:17
Stub from `flutter create --template plugin_ffi` with GitHub workflow support.
…port. (dart-archive/jnigen#87)

* C bindings no longer use fully qualified names. Instead, it uses number-renamed simple names. The classes are sorted in the summarizer to ensure the order is deterministic. This enables shorter symbol names and less verbose bindings.

* C bindings are formatted using same style as Dart SDK, using clang-format. If clang-format is not available, jnigen will issue a warning.
Closes: https://github.com/dart-lang/jnigen/issues/84

* C bindings return `JniResult`. The older `Jni.checkException` stopgap is removed. It reduces one line per function binding in dart. Lastly exceptions will work properly on android
Closes: https://github.com/dart-lang/jnigen/issues/56
dependabot bot and others added 5 commits October 14, 2023 09:54
…en#404)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@f43a0e5...8ade135)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…hive/jnigen#411)

Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.10.0 to 2.12.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/subosito/flutter-action/releases">subosito/flutter-action's releases</a>.</em></p>
<blockquote>
<h2>v2.12.0</h2>
<p>No release notes provided.</p>
<h2>v2.11.0</h2>
<p>Allow git ref as version for master channel:</p>
<pre lang="yaml"><code>steps:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
  with:
    flutter-version: '5b12b74' # tag, commit or branch
    channel: 'master'
- run: flutter --version
</code></pre>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/subosito/flutter-action/commit/2783a3f08e1baf891508463f8c6653c258246225"><code>2783a3f</code></a> ensure setup.sh executable; fixes <a href="https://redirect.github.com/subosito/flutter-action/issues/245">https://github.com/dart-lang/jnigen/issues/245</a></li>
<li><a href="https://github.com/subosito/flutter-action/commit/c33c37022b3aac486cc5e7aea5c7f6b8b0f421e1"><code>c33c370</code></a> Extract to a temporary location to enable moving of flutter folder. (<a href="https://redirect.github.com/subosito/flutter-action/issues/227">https://github.com/dart-lang/jnigen/issues/227</a>)</li>
<li><a href="https://github.com/subosito/flutter-action/commit/cc97e1648fff6ca5cc647fa67f47e70f7895510b"><code>cc97e16</code></a> feat: Allow git ref as version in <code>master</code> channel (<a href="https://redirect.github.com/subosito/flutter-action/issues/237">https://github.com/dart-lang/jnigen/issues/237</a>)</li>
<li><a href="https://github.com/subosito/flutter-action/commit/ed388baf1d5404fd6ef3c54c2f82e6159150b60f"><code>ed388ba</code></a> fixes <a href="https://redirect.github.com/subosito/flutter-action/issues/224">https://github.com/dart-lang/jnigen/issues/224</a>; update readme</li>
<li>See full diff in <a href="https://github.com/subosito/flutter-action/compare/48cafc24713cca54bbe03cdc3a423187d413aafa...2783a3f08e1baf891508463f8c6653c258246225">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=subosito/flutter-action&package-manager=github_actions&previous-version=2.10.0&new-version=2.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>
…en#412)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@8ade135...b4ffde6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dcharkes
Copy link
Collaborator

Can we review and land some of the steps on the JNIgen repo before doing the history rewrite? It's a bit hard to review changes before hitting the merge button.

Candidates:

  • Use top-level readme as package:jnigen's readme and remove the top-level one.
  • Change the workflow name.

@coveralls
Copy link

coveralls commented Nov 16, 2023

Coverage Status

coverage: 90.813% (-1.0%) from 91.804%
when pulling 9d35138 on merge-jnigen
into c64e9c8 on main.

@HosseinYousefi
Copy link
Member Author

Can we review and land some of the steps on the JNIgen repo before doing the history rewrite? It's a bit hard to review changes before hitting the merge button.

Candidates:

  • Use top-level readme as package:jnigen's readme and remove the top-level one.

I basically rewrote the history in a way that the top-level readme has always been in pkgs/jnigen. So we can just confirm that it's the case right now.

  • Change the workflow name.

Again, I rewrote the history so that the name of the workflow's file is jnigen.yaml instead of what it was before.

There is a separate commit with only the new changes (Make GitHub workflow ready for the merger)

I'll try to get the CI working, and if that happens then I think we're in a good spot to merge it.

@dcharkes dcharkes merged commit 4179fbd into main Nov 17, 2023
18 checks passed
@dcharkes dcharkes deleted the merge-jnigen branch November 17, 2023 09:15
@dcharkes dcharkes mentioned this pull request Jan 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type-infra A repository infrastructure change or enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge this repo into dart-lang/native
9 participants