Merge conflicts

Author: transistorsoft-pkg

CHANGELOG.md

@@ -25,6 +25,9 @@ at com.transistorsoft.locationmanager.location.SingleLocationRequest.start(Singl
 .
 ```
 
+## 4.10.1 — 2023-03-13
+* [Android] Fix expo plugin failing on Expo SDK >= 48.  Regular expressions failed because Expo changed lines in the build.gradle files that the Expo plugin was using for anchors for where to inject new src.  Changed to use more fundamental anchor elements for regular expressions that must exist.
+
 ## 4.10.0 — 2023-02-01
 * [Fixed][Android] Implement support for `play-services-location v21` (`ext.playServicesLocationVersion` in your `android/build.gradle`).  The plugin can now work with either `<= v20` or `>= v21`.
 

expo/plugin/src/androidPlugin.ts

@@ -88,7 +88,7 @@ const applyAppGradle = (buildGradle:string) => {
     tag: `[${MODULE_NAME}]-project`,
     src: buildGradle,
     newSrc: newSrc.join("\n"),
-    anchor: /\"react\.gradle\"\)/,
+    anchor: /android\s\{/,
     offset: 1,
     comment: "//",
   }).contents;
@@ -140,7 +140,7 @@ const applyMavenUrl = (buildGradle: string):string => {
     tag: `[${MODULE_NAME}-maven`,
     src: buildGradle,
     newSrc: `\tmaven { url "\${project(":${MODULE_NAME}").projectDir}/libs" }`,
-    anchor: /mavenLocal\(\)/,
+    anchor: /maven\s\{/,
     offset: 1,
     comment: "//",
   }).contents;