Bitrise build 11954

Geotab · Nov 19, 2024 · 577eb51 · 577eb51
1 parent 92800a4
commit 577eb51
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 14 deletions.
diff --git a/geotabdrivesdk/build.gradle.kts b/geotabdrivesdk/build.gradle.kts
@@ -1,14 +1,14 @@
 import java.util.Properties
 
-val versionName = "6.7.1_72920"
+val versionName = "6.7.1_72954"
 
 plugins {
     id("com.android.library")
     kotlin("android")
     id("org.jetbrains.dokka") version "1.8.10"
     id("maven-publish")
     id("kotlin-parcelize")
-    id("com.google.devtools.ksp") version "1.7.20-1.0.8"
+    id("com.google.devtools.ksp")
 }
 
 apply {
@@ -17,6 +17,7 @@ apply {
 
 android {
     compileSdk = 34
+    namespace = "com.geotab.mobile.sdk"
 
     defaultConfig {
         minSdk = 24
@@ -60,6 +61,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     tasks {
@@ -106,6 +108,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+
     lint {
         abortOnError = true
         ignore += listOf("GradleDependency", "ObsoleteLintCustomCheck")
@@ -124,16 +127,16 @@ dependencies {
     implementation("com.github.spullara.mustache.java:compiler:0.8.18")
     implementation("androidx.fragment:fragment-ktx:1.4.0-alpha07")
     implementation("androidx.lifecycle:lifecycle-common:2.5.1")
-    debugImplementation("com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava")
+    implementation("com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava")
     debugImplementation("androidx.fragment:fragment-testing:1.6.0-alpha04")
     implementation("com.google.code.gson:gson:2.9.0")
     implementation ("androidx.room:room-runtime:2.5.2")
     implementation("androidx.room:room-ktx:2.5.2")
     annotationProcessor("androidx.room:room-compiler:2.5.2")
-    ksp("androidx.room:room-compiler:2.5.2")
+    ksp("androidx.room:room-compiler:2.6.1")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.jetbrains.kotlin:kotlin-test:1.7.0")
-    testImplementation("io.mockk:mockk:1.13.3")
+    testImplementation("org.jetbrains.kotlin:kotlin-test:2.0.20")
+    testImplementation("io.mockk:mockk:1.12.3")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
     androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2-native-mt")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.31")
@@ -197,7 +200,10 @@ tasks.register<Copy>("copyTestFiles") {
 }
 
 afterEvaluate {
-    tasks.named("javaPreCompileDebugUnitTest") {
+    tasks.named("processDebugUnitTestJavaRes") {
+        dependsOn("copyTestFiles")
+    }
+    tasks.named("processReleaseUnitTestJavaRes") {
         dependsOn("copyTestFiles")
     }
 }

diff --git a/geotabdrivesdk/src/main/AndroidManifest.xml b/geotabdrivesdk/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.geotab.mobile.sdk">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature
         android:name="android.hardware.camera"

diff --git a/geotabdrivesdk/src/main/assets/ModuleFunction.GetMinAvailabilityHtmlFunction.Api.js b/geotabdrivesdk/src/main/assets/ModuleFunction.GetMinAvailabilityHtmlFunction.Api.js
@@ -7,7 +7,8 @@
     }
 
     const api = window.webViewLayer.getApi(userName);
-    const availabilityHtml = await api.mobile.user.getMinAvailabilityHtml();
+    // legacy html set to false to retrieve the new availability html
+    const availabilityHtml = await api.mobile.user.getMinAvailabilityHtml(false);
 
     window.geotabModules.{{moduleName}}.{{functionName}}(
       { callerId, result: availabilityHtml },

diff --git a/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/logging/InternalAppLogging.kt b/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/logging/InternalAppLogging.kt
@@ -1,8 +1,10 @@
 package com.geotab.mobile.sdk.logging
 
 import android.util.Log
+import androidx.annotation.Keep
 import com.geotab.mobile.sdk.module.app.AppLogEventListener
 
+@Keep
 enum class LogLevel(val type: Int) {
     INFO(0),
     WARN(1),
@@ -18,10 +20,12 @@ enum class LogLevel(val type: Int) {
     }
 }
 
+@Keep
 class InternalAppLogging(
     private val listener: AppLogEventListener
 ) : Logging {
 
+    @Keep
     companion object {
         @Volatile
         var appLogger: Logging? = null

diff --git a/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/logging/Logging.kt b/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/logging/Logging.kt
@@ -1,7 +1,9 @@
 package com.geotab.mobile.sdk.logging
 
 import android.util.Log
+import androidx.annotation.Keep
 
+@Keep
 interface Logging {
     fun debug(tag: String, message: String)
     fun info(tag: String, message: String)
@@ -10,6 +12,7 @@ interface Logging {
     fun error(tag: String, message: String, exception: Throwable)
 }
 
+@Keep
 class DefaultLogging : Logging {
     override fun debug(tag: String, message: String) {
         Log.d(tag, message)

diff --git a/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/models/enums/GeotabDriveError.kt b/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/models/enums/GeotabDriveError.kt
@@ -26,5 +26,6 @@ enum class GeotabDriveError {
     OPENCAB_ERROR,
     STORAGE_MODULE_ERROR,
     OVERLAY_ERROR,
-    PIP_MODULE_ERROR
+    PIP_MODULE_ERROR,
+    PUSH_NOTIFICATION_ERROR
 }
diff --git a/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/module/BaseCallbackFunction.kt b/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/module/BaseCallbackFunction.kt
@@ -94,9 +94,8 @@ abstract class BaseCallbackFunction(open val name: String) :
 
             delay(DriveSdkConfig.apiCallTimeoutMilli)
 
-            callbacks[callerId]?.let { singleCallback ->
+            callbacks.remove(callerId)?.let { singleCallback ->
                 singleCallback(Failure(Error(GeotabDriveError.API_CALL_TIMEOUT_ERROR)))
-                callbacks.remove(callerId)
             }
         }
     }

diff --git a/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/module/BaseFunction.kt b/geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/module/BaseFunction.kt
@@ -1,5 +1,6 @@
 package com.geotab.mobile.sdk.module
 
+import androidx.annotation.Keep
 import com.geotab.mobile.sdk.Error
 import com.geotab.mobile.sdk.models.enums.GeotabDriveError
 import com.google.gson.Gson
@@ -11,6 +12,7 @@ import java.lang.reflect.Type
  *
  * @param T the type of object the JSON String will be transformed into
  */
+@Keep
 abstract class BaseFunction<T> {
     abstract fun getType(): Type
 

diff --git a/geotabdrivesdk/src/main/res/values-de/strings.xml b/geotabdrivesdk/src/main/res/values-de/strings.xml
@@ -4,4 +4,6 @@
     <string name="refresh">Aktualisierung</string>
     <string name="errorMsg">Versuchen Sie es erneut, um fortzufahren.</string>
     <string name="networkError">Keine Netzwerkverbindung</string>
+    <string name="default_notification_channel_name">MyGeotab Regelausnahmen</string>
+    <string name="default_notification_channel_desc">Kanal zur Information der Administratoren über Regelausnahmen</string>
 </resources>
diff --git a/geotabdrivesdk/src/main/res/values-es/strings.xml b/geotabdrivesdk/src/main/res/values-es/strings.xml
@@ -4,4 +4,6 @@
     <string name="refresh">Actualizar</string>
     <string name="errorMsg">Trate de nuevo para proseguir.</string>
     <string name="networkError">No hay conexión de red</string>
+    <string name="default_notification_channel_name">Excepciones de las reglas de MyGeotab</string>
+    <string name="default_notification_channel_desc">Canal para informar a los administradores de las excepciones a las reglas</string>
 </resources>
diff --git a/geotabdrivesdk/src/main/res/values-fr/strings.xml b/geotabdrivesdk/src/main/res/values-fr/strings.xml
@@ -4,4 +4,6 @@
     <string name="refresh">Rafraîchir</string>
     <string name="errorMsg">Veuillez réessayer pour continuer.</string>
     <string name="networkError">Pas de connexion au réseau</string>
+    <string name="default_notification_channel_name">Exceptions aux règles de MyGeotab</string>
+    <string name="default_notification_channel_desc">Canal pour informer les admininistrateurs des exceptions aux règles</string>
 </resources>
diff --git a/geotabdrivesdk/src/main/res/values-ja/strings.xml b/geotabdrivesdk/src/main/res/values-ja/strings.xml
@@ -4,4 +4,6 @@
     <string name="refresh">更新</string>
     <string name="errorMsg">再度お試しください。</string>
     <string name="networkError">ネットワークは接続されていません</string>
+    <string name="default_notification_channel_name">MyGeotab例外規定</string>
+    <string name="default_notification_channel_desc">ルールの例外を管理者に通知するチャンネル</string>
 </resources>
diff --git a/geotabdrivesdk/src/main/res/values-pl/strings.xml b/geotabdrivesdk/src/main/res/values-pl/strings.xml
@@ -4,4 +4,6 @@
     <string name="refresh">Odświeżać</string>
     <string name="errorMsg">Spróbuj ponownie.</string>
     <string name="networkError">Brak połączenia z Internetem</string>
+    <string name="default_notification_channel_name">Wyjątki reguły dla MyGeotab</string>
+    <string name="default_notification_channel_desc">Kanał do informowania administratorów o wyjątkach od reguł</string>
 </resources>
diff --git a/geotabdrivesdk/src/main/res/values-pt/strings.xml b/geotabdrivesdk/src/main/res/values-pt/strings.xml
@@ -4,5 +4,6 @@
     <string name="refresh">Atualizar</string>
     <string name="errorMsg">Tente novamente para continuar.</string>
     <string name="networkError">Sem conexão de rede</string>
-
+    <string name="default_notification_channel_name">Excepções de regras para MyGeotab</string>
+    <string name="default_notification_channel_desc">Canal para informar os administradores das excepções às regras</string>
 </resources>
diff --git a/geotabdrivesdk/src/main/res/values/strings.xml b/geotabdrivesdk/src/main/res/values/strings.xml
@@ -6,4 +6,7 @@
     <string name="networkError">No Network Connection</string>
     <string name="download_error" tools:ignore="MissingTranslation">Download failed.</string>
     <string name="downloading" tools:ignore="MissingTranslation">Downloading %1$s</string>
+    <string name="default_notification_channel_id" tools:ignore="MissingTranslation">RulesViolationChannel</string>
+    <string name="default_notification_channel_name">MyGeotab rule exceptions</string>
+    <string name="default_notification_channel_desc">Channel for informing admins of rule exceptions</string>
 </resources>