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

Updated testing_app for upcoming release #666

Merged
merged 1 commit into from
Feb 6, 2021
Merged

Updated testing_app for upcoming release #666

merged 1 commit into from
Feb 6, 2021

Conversation

adarsh-technocrat
Copy link
Contributor

@adarsh-technocrat adarsh-technocrat commented Jan 21, 2021 •
edited
Loading

Fixed Issue #658

cc: @domesticmouse, @RedBrogdon

tusharojha
tusharojha suggested changes Jan 21, 2021
View reviewed changes
Copy link
Contributor

@tusharojha tusharojha left a comment

Choose a reason for hiding this comment

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

Looks like you are on the beta channel. Since the testing_app is based on the stable channel, so you need to checkout to stable.

@adarsh-technocrat
Copy link
Contributor Author

Looks like you are on the beta channel. Since the testing_app is based on the stable channel, so you need to checkout to stable.

Thank you @tusharojha for reviewing my PR while making changes in the repo I was in the master channel of flutter. I'm new to opensource contribution if you could provide me with some more details regarding this in steps it would helpful for me.

@tusharojha
Copy link
Contributor

Hi @adarsh-technocrat!
Sorry, Actually I have just gone through the issues & PRs. So, I think @domesticmouse will give you the right steps for it as there some changes in the GitHub CI to be merged.

@adarsh-technocrat
Copy link
Contributor Author

Hi @adarsh-technocrat!
Sorry, Actually I have just gone through the issues & PRs. So, I think @domesticmouse will give you the right steps for it as there some changes in the GitHub CI to be merged.

No problem @tusharojha.
Thank you!

@domesticmouse
Copy link
Contributor

domesticmouse commented Jan 25, 2021 •
edited
Loading

This PR is going to have to wait until after the next Flutter stable release before landing. In the mean time you'll have to keep up with master as I merge conflicting PRs like #668. Sorry about that =)

@domesticmouse domesticmouse changed the title Updated testing_app for upcoming release (flutter#658) Updated testing_app for upcoming release Jan 25, 2021
@adarsh-technocrat
Copy link
Contributor Author

This PR is going to have to wait until after the next Flutter stable release before landing. In the mean time you'll have to keep up with master as I merge conflicting PRs like #668. Sorry about that =)

Sure @domesticmouse just have one question is this is the right time to land this kind of PR if this is fine I may land PR for the rest of the issues which are required to update for the upcoming release.

@domesticmouse
Copy link
Contributor

This is a good time to create PRs like this one, but we can't land it in master until the next Flutter stable is released.

@adarsh-technocrat
Copy link
Contributor Author

adarsh-technocrat commented Jan 27, 2021 •
edited
Loading

This is a good time to create PRs like this one, but we can't land it in master until the next Flutter stable is released.

Thanks, @domesticmouse ☺️.

@adarsh-technocrat adarsh-technocrat changed the base branch from master to beta January 31, 2021 05:55
@adarsh-technocrat adarsh-technocrat changed the base branch from beta to master January 31, 2021 05:58
@adarsh-technocrat
Copy link
Contributor Author

Hello, @RedBrogdon can you please review this PR as well?

@RedBrogdon
Copy link
Contributor

Hello, @RedBrogdon can you please review this PR as well?

Sure thing. The code change here is small, so it should be an easy thing to land in that sense. There's a slight trick here in that another PR for testing_app that changes the pubspec was recently landed. The best course of action would be to:

  1. Rebase your PR on the current master or otherwise pull those changes into your branch, to remove the merge conflict.
  2. Change the base branch for this PR to beta, since (like your other PRs) this one is working ahead of Flutter's stable branch.

It's important to do #1, since otherwise we'll have a nasty merge conflict waiting for us when the next stable release rolls out. 😄

@adarsh-technocrat adarsh-technocrat changed the base branch from master to beta January 31, 2021 07:20
@adarsh-technocrat adarsh-technocrat changed the base branch from beta to master February 1, 2021 13:32
@adarsh-technocrat adarsh-technocrat changed the base branch from master to beta February 1, 2021 15:13
@adarsh-technocrat adarsh-technocrat changed the base branch from beta to master February 1, 2021 15:13
@adarsh-technocrat adarsh-technocrat changed the base branch from master to beta February 1, 2021 15:14
@RedBrogdon RedBrogdon merged commit a36dc00 into flutter:beta Feb 6, 2021
RedBrogdon pushed a commit to RedBrogdon/samples that referenced this pull request Feb 7, 2021
@adarsh-technocrat @RedBrogdon
Updated deprecated widgets with new one (flutter#666)
7eb7f1a
@adarsh-technocrat adarsh-technocrat deleted the Update-testing_app branch February 8, 2021 19:22
auto-submit bot pushed a commit that referenced this pull request Sep 10, 2024
@dependabot
Bump actions/setup-java from 4.2.2 to 4.3.0 (#2434)
578477a 
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.2 to 4.3.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/actions/setup-java/releases">actions/setup-java's releases</a>.</em></p>
<blockquote>
<h2>v4.3.0</h2>
<p>What's Changed</p>
<ul>
<li>Add support for SapMachine JDK/JRE by <a href="https://github.com/Shegox"><code>@�Shegox</code></a> in <a href="https://redirect.github.com/actions/setup-java/issues/614">#614</a></li>
</ul>
<pre lang="yaml"><code>steps:
 - name: Checkout
   uses: actions/checkout@v4
 - name: Setup-java
   uses: actions/setup-java@v4
   with:
     distribution: �sapmachine�
     java-version: �21�
</code></pre>
<p>Bug fixes :</p>
<ul>
<li>
<pre><code>Fix typos on Corretto by @johnshajiang in [#666](actions/setup-java#666)
</code></pre>
</li>
<li>
<pre><code>IBM Semeru Enhancement on arm64 by @mahabaleshwars in [#677](actions/setup-java#677) 
</code></pre>
</li>
<li>
<pre><code>Resolve Basic Validation Check Failures by @aparnajyothi-y� in [#682](actions/setup-java#682) 
</code></pre>
</li>
</ul>
<p>New Contributors :</p>
<ul>
<li>
<pre><code>@johnshajiang made their first contribution in [#666](actions/setup-java#666) 
</code></pre>
</li>
<li>
<pre><code>@Shegox made their first contribution in [#614](actions/setup-java#614)
</code></pre>
</li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/actions/setup-java/compare/v4...v4.3.0">https://github.com/actions/setup-java/compare/v4...v4.3.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/actions/setup-java/commit/2dfa2011c5b2a0f1489bf9e433881c92c1631f88"><code>2dfa201</code></a> basic validation failure fix (<a href="https://redirect.github.com/actions/setup-java/issues/682">#682</a>)</li>
<li><a href="https://github.com/actions/setup-java/commit/7467385c615a13cecd14d5768e738332968d0792"><code>7467385</code></a> feat: add support for SapMachine JDK/JRE (<a href="https://redirect.github.com/actions/setup-java/issues/614">#614</a>)</li>
<li><a href="https://github.com/actions/setup-java/commit/8e04ddff28554375a9a1096c888a2ef2c9803cd7"><code>8e04ddf</code></a> Update Error Messages and Fix Architecture Detection for IBM Semeru (<a href="https://redirect.github.com/actions/setup-java/issues/677">#677</a>)</li>
<li><a href="https://github.com/actions/setup-java/commit/67fbd726daaf08212a7b021c1c4d117f94a81dd3"><code>67fbd72</code></a> Fix typos on Corretto (<a href="https://redirect.github.com/actions/setup-java/issues/665">#665</a>) (<a href="https://redirect.github.com/actions/setup-java/issues/666">#666</a>)</li>
<li>See full diff in <a href="https://github.com/actions/setup-java/compare/6a0805fcefea3d4657a47ac4c165951e33482018...2dfa2011c5b2a0f1489bf9e433881c92c1631f88">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.2.2&new-version=4.3.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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tusharojha tusharojha tusharojha requested changes

@RedBrogdon RedBrogdon RedBrogdon 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.
4 participants
@adarsh-technocrat @tusharojha @domesticmouse @RedBrogdon