Merge pull request #1662 from transistorsoft/hms

[RELEASE] 4.11.0

Author: christocracy

CHANGELOG.md

@@ -1,3 +1,11 @@
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven { url 'https://developer.huawei.com/repo/' }
+    }
+}
+
 apply plugin: 'com.android.library'
 
 // Android dependencies
@@ -7,6 +15,7 @@ def DEFAULT_APP_COMPAT_VERSION                      = "1.4.1"
 
 // Plugin dependencies
 def DEFAULT_GOOGLE_PLAY_SERVICES_LOCATION_VERSION   = "20.0.0"
+def DEFAULT_HMS_LOCATION_VERSION                    = "6.0.0.302"
 def DEFAULT_OK_HTTP_VERSION                         = "3.12.13"
 def DEFAULT_ANDROID_PERMISSIONS_VERSION             = "2.1.6"
 def DEFAULT_EVENTBUS_VERSION                        = "3.3.1"
@@ -41,8 +50,7 @@ dependencies {
     // Prefer appCompatVersion vs supportLibVersion.
     def appCompatVersion = safeExtGet('appCompatVersion', DEFAULT_APP_COMPAT_VERSION)
     def playServicesLocationVersion = safeExtGet('googlePlayServicesLocationVersion', DEFAULT_GOOGLE_PLAY_SERVICES_LOCATION_VERSION)
-
-    def locationMajorVersion = playServicesLocationVersion.split('\\.')[0] as int
+    def hmsLocationVersion = safeExtGet('hmsLocationVersion', DEFAULT_HMS_LOCATION_VERSION);
     def okHttpVersion = safeExtGet('okHttpVersion', DEFAULT_OK_HTTP_VERSION)
     def androidPermissionsVersion = safeExtGet('androidPermissionsVersion', DEFAULT_ANDROID_PERMISSIONS_VERSION)
     def eventBusVersion = safeExtGet('eventBusVersion', DEFAULT_EVENTBUS_VERSION)
@@ -52,6 +60,7 @@ dependencies {
 
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
 
+    def locationMajorVersion = playServicesLocationVersion.split('\\.')[0] as int
     if (locationMajorVersion >= 21) {
         api(group: 'com.transistorsoft', name:'tslocationmanager-v21', version: '+')
     } else {
@@ -60,6 +69,11 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "com.google.android.gms:play-services-location:$playServicesLocationVersion"
+    // HMS location
+    implementation("com.huawei.hms:location:$hmsLocationVersion") {
+      exclude(group: "com.huawei.hms", module: 'hianalytics')
+    }
+
     implementation "org.greenrobot:eventbus:$eventBusVersion"
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
     implementation 'org.slf4j:slf4j-api:1.7.36'

android/build.gradle

@@ -0,0 +1 @@
+698e1c71f30dd8815cd1e3e7065942d8

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.aar.md5

@@ -0,0 +1 @@
+06db0e27efe59adbc6027273a0891ac1aab569cb

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.aar.sha1

@@ -0,0 +1 @@
+7461e70dc314d6f6cdb1239b289060769785eb9b6c4a35003b176a12c1e28169

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.aar.sha256

@@ -0,0 +1 @@
+3408b8a7569637de2ee6cbf9df9ed2a2a015325bd7ea771b3961deb6c985873827867e90925b6ba46d547225a07364b00bca8e7c53f89ce99ba360397f45a8f5

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.aar.sha512

@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager-v21</artifactId>
-  <version>3.3.1</version>
+  <version>3.4.0</version>
   <packaging>aar</packaging>
 </project>

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.pom.md5

@@ -0,0 +1 @@
+d7ed3715a6e4bdd83bf0cc88938c3cab

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.pom.sha1

@@ -0,0 +1 @@
+0c605723c4662f9d54816f6a84402166c6e432b8

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.pom.sha256

@@ -0,0 +1 @@
+0b46492b9ca9dbb368dba394987b7abe4a491f627ccb65e7d1af9598a8088433

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.pom.sha512

@@ -0,0 +1 @@
+8b212812e2ade20736c5588bb340c68c63710e8118468b28c5abc24ddf4b5c1ccea9d3cd14f18b538fbb505e0b2d3b08e76148cb401ce61570ef4ca18f30aed2

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.aar renamed to android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.aar

@@ -3,11 +3,11 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager-v21</artifactId>
   <versioning>
-    <latest>3.3.1</latest>
-    <release>3.3.1</release>
+    <latest>3.4.0</latest>
+    <release>3.4.0</release>
     <versions>
-      <version>3.3.1</version>
+      <version>3.4.0</version>
     </versions>
-    <lastUpdated>20230201142615</lastUpdated>
+    <lastUpdated>20230329134221</lastUpdated>
   </versioning>
 </metadata>

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.aar.md5

@@ -0,0 +1 @@
+ddaeb1f78609e90acb64b61179b62a4f

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.aar.sha1

@@ -0,0 +1 @@
+a0219fe44e792f920aaac2d60e36f1907b689654

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.aar.sha256

@@ -0,0 +1 @@
+032fcc5b964a341d8f1eb186354d15458d1321a905f7fdd83fd9cbb9c2b30ad9

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.aar.sha512

@@ -0,0 +1 @@
+7699e9af63c583971c24b039b92989a566c54a9f4f705faa8d42cca753f209d1e1bc61401229c9d4b3d8cf4e7535e0b5de5f43984c53f397d980d3a53cd85dca

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.pom renamed to android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.pom

@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager</artifactId>
-  <version>3.3.1</version>
+  <version>3.4.0</version>
   <packaging>aar</packaging>
 </project>

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.pom.md5

@@ -0,0 +1 @@
+6a8b172fedcaf99213139d6b47a2b597

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.pom.sha1

@@ -0,0 +1 @@
+4353d2aa4bd2673b5175059560db47d723b91334

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.pom.sha256

@@ -0,0 +1 @@
+efb1017e8352c407ab134618f2576b81b0d41fc81ced7d86b40f7ed986de0656

android/libs/com/transistorsoft/tslocationmanager-v21/3.4.0/tslocationmanager-v21-3.4.0.pom.sha512

@@ -0,0 +1 @@
+473cb83bb2dba32274f26872e6b2fc2199550356c3d9f0160f5a582e3b850400ffe15d9410ee043623f4bc248b10a6e2fb07edd79d1575bcadf26aabeeec6872

android/libs/com/transistorsoft/tslocationmanager-v21/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager</artifactId>
   <versioning>
-    <latest>3.3.1</latest>
-    <release>3.3.1</release>
+    <latest>3.4.0</latest>
+    <release>3.4.0</release>
     <versions>
-      <version>3.3.1</version>
+      <version>3.4.0</version>
     </versions>
-    <lastUpdated>20230201142615</lastUpdated>
+    <lastUpdated>20230329134221</lastUpdated>
   </versioning>
 </metadata>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.aar.md5

@@ -4,6 +4,11 @@
 -keep class com.transistorsoft** { *; }
 -dontwarn com.transistorsoft.**
 
+# Huawei Adapter
+-keep class com.google.android.gms.** {*;}
+-keep interface com.google.android.gms.** {*;}
+-dontwarn com.huawei.**
+
 # BackgroundGeolocation (EventBus)
 -keepattributes *Annotation*
 -keepclassmembers class * {
@@ -28,3 +33,7 @@
 -dontwarn org.conscrypt.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+# LifecycleObserver
+-keep class androidx.lifecycle.FullLifecycleObserver
+

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.aar.sha1

@@ -27,7 +27,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.google.android.gms.common.GoogleApiAvailability;
+import com.transistorsoft.xms.g.common.ExtensionApiAvailability;
 
 import com.transistorsoft.locationmanager.adapter.BackgroundGeolocation;
 import com.transistorsoft.locationmanager.adapter.TSConfig;
@@ -1044,7 +1044,7 @@ private void handlePlayServicesConnectError(Integer errorCode) {
         if (activity == null) {
             return;
         }
-        GoogleApiAvailability.getInstance().getErrorDialog(getCurrentActivity(), errorCode, 1001).show();
+        ExtensionApiAvailability.getInstance().getErrorDialog(getCurrentActivity(), errorCode, 1001).show();
     }
 
     private void sendEvent(String eventName, WritableMap params) {

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.aar.sha256

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.aar.sha512

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.pom.md5

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.pom.sha1

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.pom.sha256

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.pom.sha512

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager-v21/3.3.1/tslocationmanager-v21-3.3.1.aar renamed to android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.aar

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.aar.md5

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.aar.sha1

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.aar.sha256

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.aar.sha512

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.3.1/tslocationmanager-3.3.1.pom renamed to android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.pom

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.pom.md5

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.pom.sha1

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>

android/libs/com/transistorsoft/tslocationmanager/3.4.0/tslocationmanager-3.4.0.pom.sha256

@@ -19,7 +19,7 @@
 					<div class="brand">
 						<a class="logo" href="https://www.transistorsoft.com"><img src="../assets/images/transistor-logo-bw.svg" /></a>
 						<span class="title">
-							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.10.0</span>
+							<a href="/react-native-background-geolocation">[API Docs] React Native Background Geolocation</a>&nbsp;<span class="tsd-flag ts-flagOptional ts-flagVersion">v 4.11.0</span>
 						</span>
 					</div>
 				</div>