Skip to content

Commit

Permalink
Use react.gradle from repo root instead of copy in RNTester
Browse files Browse the repository at this point in the history
Summary:
RNTester used a copy of the main react.gradle file instead of the real one. Recent changes to the real file caused builds to fail with older gradle versions but was not caught by CI because it wasn't using that file for RNTester. That copy of react.gradle is just a leftover from when projects included a copy instead of importing the one in RN directly.

Note: CI WILL fail with this PR, if we have trouble landing this I can add the revert in this commit too but wanted to keep it as 2 separate commits.

Tested that building RNTester actually fails now that it uses react.gradle with recent changes, then tested that is builds properly when reverting d16ff3b.

[INTERNAL] [MINOR] [RNTester] - Use react.gradle from repo root instead of copy in RNTester
Closes #18188

Differential Revision: D7155179

Pulled By: hramos

fbshipit-source-id: 15b461a63b841bf807e7d11ba3ead005ca5e33b0
  • Loading branch information
janicduplessis authored and facebook-github-bot committed Mar 5, 2018
1 parent 3f8a04b commit 9f239d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 97 deletions.
2 changes: 1 addition & 1 deletion RNTester/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ project.ext.react = [
inputExcludes: ["android/**", "./**"]
]

apply from: "react.gradle"
apply from: "../../../react.gradle"

/**
* Set this to true to create three separate APKs instead of one:
Expand Down
96 changes: 0 additions & 96 deletions RNTester/android/app/react.gradle

This file was deleted.

0 comments on commit 9f239d7

Please sign in to comment.