Merge branch 'release/1.4.13'

Author: heart

pam-android-kotlin/build.gradle

@@ -43,7 +43,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.7.0"
     implementation 'com.google.firebase:firebase-messaging-ktx:23.0.6'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-native-mt'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation ('com.github.mrmike:ok2curl:0.7.0'){
         exclude group:"com.squareup.okhttp3", module:"okhttp"
@@ -53,4 +53,10 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.13.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.2.3'
+
+    testImplementation 'org.robolectric:robolectric:4.8'
+    testImplementation('org.threeten:threetenbp:1.4.2') {
+        exclude group: 'com.jakewharton.threetenabp', module: 'threetenabp'
+    }
+    testImplementation "androidx.test:core-ktx:1.4.0"
 }

pam-android-kotlin/src/androidTest/java/ai/pams/android/kotlin/ExampleInstrumentedTest.kt

@@ -1,14 +1,12 @@
 package ai.pams.android.kotlin
 
 import ai.pams.android.kotlin.flex.parser.FlexParser
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/utils/DateUtils.kt

@@ -7,7 +7,7 @@ import org.threeten.bp.format.DateTimeFormatter
 class DateUtils {
     companion object {
 
-        fun getDateFormat() = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+        fun getDateFormat() = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.of("GMT0"))
 
         fun hourFromGMT(): Int {
             val now = LocalDateTime.now()

pam-android-kotlin/src/test/java/ai/pams/android/kotlin/ExampleUnitTest.kt

@@ -1,17 +1,22 @@
 package ai.pams.android.kotlin
 
-import org.junit.Test
-
+import ai.pams.android.kotlin.utils.DateUtils
 import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
+@RunWith(RobolectricTestRunner::class)
 class ExampleUnitTest {
     @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
+    fun testParseDate() {
+        val str = "2022-06-29 03:53:51"
+        val date = DateUtils.localDateTimeFromString(str)
+        assertEquals(date.hour, 10)
     }
 }