Merge pull request #296 from mindbox-moscow/release-2.4.0

Release 2.4.0

Author: anokhinal

dependencies.gradle

@@ -23,7 +23,8 @@ ext {
         koin: 'io.insert-koin:koin-android:3.2.2',
         koin_test: 'io.insert-koin:koin-test:3.2.2',
         koin_junit4: 'io.insert-koin:koin-test-junit4:3.2.2',
-        constraint_layout: 'androidx.constraintlayout:constraintlayout:2.1.4'
+        constraint_layout: 'androidx.constraintlayout:constraintlayout:2.1.4',
+        jdk_libs: 'com.android.tools:desugar_jdk_libs:1.2.2'
     ]
 
     testDependencies = [
@@ -34,7 +35,7 @@ ext {
         turbine: 'app.cash.turbine:turbine:0.12.1',
         mockk: 'io.mockk:mockk:1.13.2',
         mockk_android: 'io.mockk:mockk-android:1.13.2',
-        mockk_agent: 'io.mockk:mockk-agent:1.13.2',
+        mockk_agent: 'io.mockk:mockk-agent:1.13.2'
     ]
 
 }

gradle.properties

@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # SDK version property
-SDK_VERSION_NAME=2.3.0
+SDK_VERSION_NAME=2.4.0

mindbox-firebase/build.gradle

@@ -14,6 +14,7 @@ dependencies {
 
     implementation sdkDependencies.androidx_core_ktx
     implementation sdkDependencies.kotlinx_coroutines_core
+    coreLibraryDesugaring sdkDependencies.jdk_libs
 
     implementation sdkDependencies.gson
 

mindbox-huawei/build.gradle

@@ -17,4 +17,5 @@ dependencies {
     implementation sdkDependencies.hms_ads_identifier
     implementation sdkDependencies.gson
     implementation sdkDependencies.androidx_annotations
+    coreLibraryDesugaring sdkDependencies.jdk_libs
 }

modulesCommon.gradle

@@ -33,6 +33,8 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }

sdk/build.gradle

@@ -24,6 +24,7 @@ dependencies {
 
     implementation sdkDependencies.kotlin_stdlib
     implementation sdkDependencies.androidx_core_ktx
+    coreLibraryDesugaring sdkDependencies.jdk_libs
     testImplementation testDependencies.junit
     androidTestImplementation testDependencies.androidx_junit
     androidTestImplementation testDependencies.espresso
@@ -35,6 +36,7 @@ dependencies {
     testImplementation testDependencies.mockk_agent
 
 
+
     // ConstraintLayout
     implementation sdkDependencies.constraint_layout
     // Koin for Android

sdk/src/main/java/cloud/mindbox/mobile_sdk/Extensions.kt

@@ -1,10 +1,37 @@
 package cloud.mindbox.mobile_sdk
 
+import android.util.Log
 import cloud.mindbox.mobile_sdk.utils.LoggingExceptionHandler
+import java.time.*
+import java.time.format.DateTimeFormatter
 
 internal fun Map<String, String>.toUrlQueryString() = LoggingExceptionHandler.runCatching(
     defaultValue = ""
 ) {
     this.map { (k, v) -> "$k=$v" }
         .joinToString(prefix = "?", separator = "&")
 }
+
+internal fun ZonedDateTime.convertToString() = runCatching {
+    this.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"))
+}.getOrElse {
+    Log.e("Mindbox", "Error converting date", it)
+    ""
+}
+
+internal fun Instant.convertToZonedDateTimeAtUTC(): ZonedDateTime {
+    return this.atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC)
+}
+
+
+internal fun String.convertToZonedDateTime(): ZonedDateTime = runCatching {
+    return LocalDateTime.parse(this, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")).atZone(
+        ZoneOffset.UTC
+    )
+}.getOrElse {
+    Log.e("Mindbox", "Error converting date", it)
+    LocalDateTime.parse("1970-01-01T00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"))
+        .atZone(
+            ZoneId.systemDefault()
+        )
+}