Unable to modify Android gradle file with SDK 46 (#290)

expo · Oct 8, 2022 · 742ff2c · 742ff2c
1 parent 8f78e0f
commit 742ff2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,8 @@
 
 ### 🐛 Bug fixes
 
-- Added `expo` to `peerDependencies` to match own `peerDependencies` ([#286](https://github.com/expo/sentry-expo/pull/286) by [@SimenB](https://github.com/SimenB))
+- Added `expo` to `peerDependencies` to match own `peerDependencies`. ([#286](https://github.com/expo/sentry-expo/pull/286) by [@SimenB](https://github.com/SimenB))
+- Fix issue with config plugin being unable to modify Android gradle file with Expo 46. ([#290](https://github.com/expo/sentry-expo/pull/290)) by [@kbrandwijk](https://github.com/kbrandwijk))
 
 ### 🧹 Chores
 

diff --git a/plugin/build/withSentryAndroid.js b/plugin/build/withSentryAndroid.js
@@ -56,7 +56,7 @@ function modifyAppBuildGradle(buildGradle) {
     if (buildGradle.includes('/sentry.gradle"')) {
         return buildGradle;
     }
-    const pattern = /(.*\/react\.gradle"\)?)(\s|\n|$)/;
+    const pattern = /(.*(\/|")react\.gradle"\)?)(\s|\n|$)/;
     if (!buildGradle.match(pattern)) {
         config_plugins_1.WarningAggregator.addWarningAndroid('sentry-expo', 'Could not find react.gradle script in android/app/build.gradle. Please open a bug report at https://github.com/expo/sentry-expo.');
     }

diff --git a/plugin/src/withSentryAndroid.ts b/plugin/src/withSentryAndroid.ts
@@ -41,8 +41,8 @@ export function modifyAppBuildGradle(buildGradle: string) {
   if (buildGradle.includes('/sentry.gradle"')) {
     return buildGradle;
   }
-  const pattern = /(.*\/react\.gradle"\)?)(\s|\n|$)/;
-
+  const pattern = /(.*(\/|")react\.gradle"\)?)(\s|\n|$)/;
+  
   if (!buildGradle.match(pattern)) {
     WarningAggregator.addWarningAndroid(
       'sentry-expo',