Merge conflict

Author: christocracy

CHANGELOG.md

@@ -1,8 +1,11 @@
 # CHANGELOG
 
-## 4.18.1 — 2025-11-29
+## 4.18.2 — 2025-11-29
 * [Android] Rebuild with Android ELF Alignment
 
+## 4.18.1 — 2025-11-08
+* [Android] pin `tslocationmanager` at `3.+` in preparation for next release..
+
 ## 4.18.0 — 2025-09-08
 * [Android] Remove Huawei HMS support for failure to provide their SDKs with *Android 16KB Page Size* compatibility.
 

android/build.gradle

@@ -66,9 +66,9 @@ dependencies {
     // tslocationmanager requires a particular build based upon play-services-location version.
     def locationMajorVersion = playServicesLocationVersion.split('\\.')[0] as int
     if (locationMajorVersion >= 21) {
-        api(group: 'com.transistorsoft', name:'tslocationmanager-v21', version: '+')
+        api(group: 'com.transistorsoft', name:'tslocationmanager-v21', version: '3.+')
     } else {
-        api(group: 'com.transistorsoft', name:'tslocationmanager', version: '+')
+        api(group: 'com.transistorsoft', name:'tslocationmanager', version: '3.+')
     }
 
     // EventBus