Skip to content

Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639

Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom
SaeedZhiany:FixGradleWrapperFiles
Closed

Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom
SaeedZhiany:FixGradleWrapperFiles

Conversation

@SaeedZhiany

@SaeedZhianySaeedZhiany commented Dec 30, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

This PR is related to #27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.
the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.

Changelog

[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1

Test Plan

I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )

@facebook-github-botfacebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Dec 30, 2019
@SaeedZhiany

SaeedZhiany commented Dec 30, 2019

Copy link
Copy Markdown
ContributorAuthor

In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.

@kelset
kelset requested a review from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy approved these changes Jan 7, 2020
View reviewed changes

@mikehardymikehardy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with

friederbluemle
friederbluemle approved these changes Jan 10, 2020
View reviewed changes

@friederbluemlefriederbluemle left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.

Btw, the case items are not a syntax error, but it is more conventional to omit the (.

@friederbluemle

friederbluemle commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.

Please check again after this PR has been merged. The error is most likely caused by something else.

dulmandakh
dulmandakh approved these changes Jan 10, 2020
View reviewed changes

@dulmandakhdulmandakh left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.

cpojer
cpojer approved these changes Jan 10, 2020
View reviewed changes

@cpojercpojer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you!

facebook-github-bot
facebook-github-bot approved these changes Jan 10, 2020
View reviewed changes

@facebook-github-botfacebook-github-bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

@friederbluemle

friederbluemle commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.

No worries :)

Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).

@react-native-bot

react-native-bot commented Jan 13, 2020

Copy link
Copy Markdown
Collaborator

This pull request was successfully merged by @SaeedZhiany in aa0ef15.

When will my fix make it into a release? | Upcoming Releases

@react-native-botreact-native-bot added the Merged This PR has been merged. label Jan 13, 2020
@SaeedZhiany
SaeedZhiany deleted the FixGradleWrapperFiles branch January 15, 2020 05:29
osdnk pushed a commit to osdnk/react-native that referenced this pull request Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

5 more reviewers
@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Applied missing changes from bumping Gradle wrapper to 6.0.1 by SaeedZhiany · Pull Request #27639 · react/react-native · GitHub
Skip to content
Applied missing changes from bumping Gradle wrapper to 6.0.1 - #27639
Closed
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Closed
Applied missing changes from bumping Gradle wrapper to 6.0.1#27639
SaeedZhiany wants to merge 1 commit into
react:masterfrom 
SaeedZhiany:FixGradleWrapperFiles
Conversation
@SaeedZhiany
@SaeedZhianySaeedZhiany
commented
Dec 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary
This PR is related to #27290.

I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native template folder. so I create this PR to apply differences.

the main difference is in the gradlew file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in case items syntax. ( should not be used in declaring case's items. it may has building error in Linux OS.
Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Test Plan
I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running gradlew wrapper command, it should not break CI. (I hope :) )
@facebook-github-botfacebook-github-bot
added
the 
CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
label
Dec 30, 2019
@SaeedZhiany
SaeedZhiany
commented
Dec 30, 2019

Copy link


Copy Markdown

ContributorAuthor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
@kelset
kelset
requested a review
from dulmandakhJanuary 7, 2020 10:02
mikehardy
mikehardy
approved these changes
Jan 7, 2020
View reviewed changes
@mikehardymikehardy
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

This is standard - any time you bump gradle you have to commit the full set of changes - the dependency in the gradle settings file, as well as the shell wrappers and the jar. Looks like some was just missed in moving gradle to the new version and this cleans that up? Which is easy to agree with
friederbluemle
friederbluemle
approved these changes
Jan 10, 2020
View reviewed changes
@friederbluemlefriederbluemle
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

👍 Yes, this should be merged. Gradle 6.0+ comes with these updated wrapper scripts. Most likely what happened is that a previous version (Gradle 5.0+) was used to upgrade Gradle wrapper to 6.0 (which of course did not contain the new scripts yet). Running the wrapper task using Gradle 6.0.1 locally yields zero changed lines against the PR head branch.
Btw, the case items are not a syntax error, but it is more conventional to omit the (.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
In ci/circleci: test_android's log, it seems it can build Android RNTester App successfully and it failed in Collect Test Results phase because some directory has not been found.
Please check again after this PR has been merged. The error is most likely caused by something else.
dulmandakh
dulmandakh
approved these changes
Jan 10, 2020
View reviewed changes
@dulmandakhdulmandakh
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
cpojer
cpojer
approved these changes
Jan 10, 2020
View reviewed changes
@cpojercpojer
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Thank you!
facebook-github-bot
facebook-github-bot
approved these changes
Jan 10, 2020
View reviewed changes
@facebook-github-botfacebook-github-bot
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
@friederbluemle
friederbluemle
commented
Jan 10, 2020

Copy link


Copy Markdown

Contributor
LGTM. I use gradle wrapper to upgrade versions, like ./gradlew wrapper --gradle-version=6.0.1 --distribution-type=all, and it's strange that it didn't produce this change. Or I made a mistake. Sorry.
No worries :)
Tip for the future: When updating between major versions (or when updates to the wrapper scripts are expected), run the command twice: The first time ./gradlew it still the old version (unaware of the new scripts).
@react-native-bot
react-native-bot
commented
Jan 13, 2020

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @SaeedZhiany in aa0ef15.
When will my fix make it into a release? | Upcoming Releases
@react-native-botreact-native-bot
added
the 
Merged
This PR has been merged.
label
Jan 13, 2020
@SaeedZhiany
SaeedZhiany
deleted the

FixGradleWrapperFiles

branch
January 15, 2020 05:29
osdnk pushed a commit
to osdnk/react-native
that referenced
this pull request
Mar 9, 2020
@SaeedZhiany@osdnk
Applied missing changes from bumping Gradle wrapper to 6.0.1 (react#2…
0727816
…7639)
Summary:
This PR is related to react#27290.
I just upgraded my project's Gradle wrapper version to 6.0.1 and I realized some files have some differences with the files in react-native `template` folder. so I create this PR to apply differences.
the main difference is in the `gradlew` file. I'm not familiar with Linux shell scripts but it seems there was a syntax error in `case` items syntax. `(` should not be used in declaring case's items. it may has building error in Linux OS.
## Changelog
[Android] [Fixed] - Applied missing changes from bumping Gradle wrapper to 6.0.1
Pull Request resolved: react#27639
Test Plan: I have no Linux OS right now, so I can't directly test these changes, but because the changes have made by running `gradlew wrapper` command, it should not break CI. (I hope :) )
Differential Revision: D19341671
Pulled By: cpojer
fbshipit-source-id: ccfc3c12af3f5468671737e5ba0b1674b4491590
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


5 more reviewers

@cpojercpojercpojer approved these changes
@dulmandakhdulmandakhdulmandakh approved these changes
@friederbluemlefriederbluemlefriederbluemle approved these changes
@mikehardymikehardymikehardy approved these changes
@facebook-github-botfacebook-github-botfacebook-github-bot approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

BugCLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Platform: AndroidAndroid applications.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@SaeedZhiany@friederbluemle@react-native-bot@cpojer@dulmandakh@mikehardy@facebook-github-bot