Upgrade Purchasely SDK to 6.0.0

android/app/build.gradle.kts

@@ -2,7 +2,6 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
 }
@@ -60,10 +59,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
@@ -118,5 +113,7 @@ dependencies {
     androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation(libs.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.espresso.core)
     debugImplementation(libs.compose.ui.test.manifest)
 }

android/app/src/main/java/com/purchasely/shaker/data/PurchaselySdkMode.kt

@@ -7,10 +7,10 @@ enum class PurchaselySdkMode(
     val label: String,
     val runningMode: PLYRunningMode
 ) {
-    PAYWALL_OBSERVER(
-        storageValue = "paywallObserver",
-        label = "Paywall Observer",
-        runningMode = PLYRunningMode.PaywallObserver
+    OBSERVER(
+        storageValue = "observer",
+        label = "Presentation Observer",
+        runningMode = PLYRunningMode.Observer
     ),
     FULL(
         storageValue = "full",
@@ -21,9 +21,13 @@ enum class PurchaselySdkMode(
     companion object {
         const val PREFERENCES_NAME = "shaker_settings"
         const val KEY = "purchasely_sdk_mode"
-        val DEFAULT = PAYWALL_OBSERVER
+        val DEFAULT = OBSERVER
+
+        /** Storage value persisted by pre-v6 versions, when OBSERVER was named "paywallObserver". */
+        private const val LEGACY_PAYWALL_OBSERVER = "paywallObserver"
 
         fun fromStorage(value: String?): PurchaselySdkMode {
+            if (value == LEGACY_PAYWALL_OBSERVER) return OBSERVER
             return values().firstOrNull { it.storageValue == value } ?: DEFAULT
         }
     }

android/app/src/main/java/com/purchasely/shaker/data/RunningModeRepository.kt

@@ -8,13 +8,8 @@ class RunningModeRepository(private val store: KeyValueStore) {
     var runningMode: PLYRunningMode
         get() {
             val stored = store.getString(KEY_RUNNING_MODE, PurchaselySdkMode.DEFAULT.storageValue)
-            // Support legacy "observer" value from previous versions
-            val mode = if (stored == LEGACY_OBSERVER) {
-                PurchaselySdkMode.PAYWALL_OBSERVER
-            } else {
-                PurchaselySdkMode.fromStorage(stored)
-            }
-            return mode.runningMode
+            // fromStorage handles both the current "observer" value and the legacy "paywallObserver" one.
+            return PurchaselySdkMode.fromStorage(stored).runningMode
         }
         set(value) {
             val mode = PurchaselySdkMode.entries.firstOrNull { it.runningMode == value }
@@ -23,11 +18,9 @@ class RunningModeRepository(private val store: KeyValueStore) {
         }
 
     val isObserverMode: Boolean
-        get() = runningMode == PLYRunningMode.PaywallObserver
+        get() = runningMode == PLYRunningMode.Observer
 
     companion object {
         private const val KEY_RUNNING_MODE = "running_mode"
-        /** Legacy storage value from before PurchaselySdkMode unification */
-        private const val LEGACY_OBSERVER = "observer"
     }
 }

android/app/src/main/java/com/purchasely/shaker/data/purchase/PurchaseManager.kt

@@ -72,7 +72,8 @@ class PurchaseManager(
             )
             .build()
 
-        billingClient.queryProductDetailsAsync(queryParams) { billingResult, productDetailsList ->
+        billingClient.queryProductDetailsAsync(queryParams) { billingResult, queryResult ->
+            val productDetailsList = queryResult.productDetailsList
             if (billingResult.responseCode != BillingClient.BillingResponseCode.OK || productDetailsList.isEmpty()) {
                 Log.e(TAG, "[Shaker] queryProductDetails failed: ${billingResult.debugMessage}")
                 _transactionResult.tryEmit(TransactionResult.Error(billingResult.debugMessage))

android/app/src/main/java/com/purchasely/shaker/purchasely/PresentationHandle.kt

@@ -1,6 +1,6 @@
 package com.purchasely.shaker.purchasely
 
-import io.purchasely.ext.PLYPresentation
+import io.purchasely.ext.presentation.PLYPresentation
 
 @JvmInline
 value class PresentationHandle internal constructor(