Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Nov 22, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test-app.gradle
View file
Open in desktop
Expand Up @@ -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)) {
Expand Down Expand Up @@ -43,7 +43,7 @@ ext.applyTestAppSettings = { DefaultSettings defaultSettings ->
apply from: "$scriptDir/android/force-resolve-trove4j.gradle", to: scriptHandler
}

apply(defaultSettings)
applySettings(defaultSettings)
applyNativeModulesSettingsGradle(defaultSettings)
}

Expand Down