From eea3be2ec37e0c2b19946e1b4a9f643bdcc791a8 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Mon, 22 Nov 2021 19:47:52 +0100
Subject: [PATCH] fix(android): fix name clash when building with Gradle 7
 (#604)

---
 .github/workflows/build.yml | 2 +-
 test-app.gradle             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b88e2f33..709163cfd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1.86.0
         with:
-          ruby-version: '3.0'
+          ruby-version: "3.0"
           bundler: Gemfile.lock
           bundler-cache: true
       - name: Install
diff --git a/test-app.gradle b/test-app.gradle
index cdc37c23c..75e167c5f 100644
--- a/test-app.gradle
+++ b/test-app.gradle
@@ -3,7 +3,7 @@ import org.gradle.initialization.DefaultSettings
 
 import java.nio.file.Paths
 
-private static void apply(Settings settings) {
+private static void applySettings(Settings settings) {
     def projectDir = settings.findNodeModulesPath(settings.rootDir, "react-native-test-app")
 
     if (settings.buildReactNativeFromSource(settings.rootDir)) {
@@ -43,7 +43,7 @@ ext.applyTestAppSettings = { DefaultSettings defaultSettings ->
         apply from: "$scriptDir/android/force-resolve-trove4j.gradle", to: scriptHandler
     }
 
-    apply(defaultSettings)
+    applySettings(defaultSettings)
     applyNativeModulesSettingsGradle(defaultSettings)
 }