Merge branch 'develop' into issues/rename-proximity-timestamps

wultra · Dec 12, 2023 · 5a9231d · 5a9231d
2 parents 7db1717 + 03eee97
commit 5a9231d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -1,6 +1,6 @@
 # BuildScript dependencies
 # some reasoning here https://discuss.gradle.org/t/place-for-properties-visible-from-both-buildsrc-and-project/18916
 
-systemProp.kotlinVersion=1.8.20
-systemProp.androidPluginVersion=8.0.2
-systemProp.dokkaVersion=1.8.10
+systemProp.kotlinVersion=1.8.22
+systemProp.androidPluginVersion=8.1.4
+systemProp.dokkaVersion=1.8.20
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -32,8 +32,8 @@ object Constants {
     }
 
     object Android {
-        const val compileSdkVersion = 31
-        const val targetSdkVersion = 31
+        const val compileSdkVersion = 33
+        const val targetSdkVersion = 33
         const val minSdkVersion = 19
         const val buildToolsVersion = "33.0.2"
     }

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -31,6 +31,7 @@ android {
 
     defaultConfig {
         minSdk = Constants.Android.minSdkVersion
+        @Suppress("DEPRECATION")
         targetSdk = Constants.Android.targetSdkVersion
 
         // since Android Gradle Plugin 4.1.0
@@ -76,8 +77,8 @@ android {
 dependencies {
     // Bundled
     implementation("org.jetbrains.kotlin:kotlin-stdlib:${Constants.BuildScript.kotlinVersion}")
-    implementation("androidx.annotation:annotation:1.6.0")
-    implementation("com.google.code.gson:gson:2.8.9")
+    implementation("androidx.annotation:annotation:1.7.0")
+    implementation("com.google.code.gson:gson:2.10.1")
     implementation("com.jakewharton.threetenabp:threetenabp:1.1.1")
     // DO NOT UPGRADE ABOVE 3.12.X! Version 3.12 is the last version supporting TLS 1 and 1.1
     // If upgraded, the app will crash on android 4.4
@@ -98,7 +99,7 @@ dependencies {
     androidTestImplementation("androidx.test:runner:1.5.2")
     androidTestImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test:core:1.5.0")
-    androidTestImplementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+    androidTestImplementation(platform("org.jetbrains.kotlin:kotlin-bom:${Constants.BuildScript.kotlinVersion}"))
 }
 
 apply("android-release-aar.gradle")
diff --git a/library/src/androidTest/java/InboxTests.kt b/library/src/androidTest/java/InboxTests.kt
@@ -29,6 +29,9 @@ class InboxTests {
 
     @After
     fun tearDown() {
+        if (!::pa.isInitialized) {
+            return
+        }
         IntegrationUtils.removeRegistration(pa.activationIdentifier)
         pa.removeActivationLocal(IntegrationUtils.context)
     }

diff --git a/library/src/androidTest/java/IntegrationTests.kt b/library/src/androidTest/java/IntegrationTests.kt
@@ -53,6 +53,9 @@ class IntegrationTests {
 
     @After
     fun tearDown() {
+        if (!::pa.isInitialized) {
+            return
+        }
         IntegrationUtils.removeRegistration(pa.activationIdentifier)
         pa.removeActivationLocal(IntegrationUtils.context)
     }