fix(android): fix name clash when building with Gradle 7 (#604)

microsoft · Nov 22, 2021 · eea3be2 · eea3be2
1 parent 1140b31
commit eea3be2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)
 }