Skip to content

Commit

Permalink
Add comments about PATH on macOS (#821)
Browse files Browse the repository at this point in the history
  • Loading branch information
mhsmith committed Nov 28, 2023
1 parent 31875a6 commit 53b9f12
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ public static String findExecutable(String name) throws FileNotFoundException {
// /usr/local/bin instead. This directory may also appear to be on the default
// PATH, but this is because it's listed in /etc/paths, which only affects
// shells, but not other apps like Android Studio and its Gradle subprocesses.
//
// As of Gradle 6.9, this appears to be unnecessary (#821). So once the
// `product` project is using a newer version than that, we can remove this
// method and let Gradle find executables itself.
List<String> path = new ArrayList<>();
String osName = System.getProperty("os.name").toLowerCase();
if (osName.startsWith("mac")) {
Expand Down
2 changes: 2 additions & 0 deletions product/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ zipStorePath=wrapper/dists
# https://discuss.gradle.org/t/my-plugin-cant-be-applied-when-plugin-is-built-with-gradle-7-1-1/40464).
# So don't change it until Gradle 6 is below our minimum requirement -- in fact, so far
# below that it isn't even being tested by AndroidPlugin.test_old.
#
# Once this is upgraded to 6.9 or later, Common.findExecutable can be removed.
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 comments on commit 53b9f12

Please sign in to comment.