superwall · ianrumac · Sep 6, 2024 · Sep 16, 2024 · Sep 19, 2024 · Oct 14, 2024
diff --git a/.github/workflows/build+test+deploy.yml b/.github/workflows/build+test+deploy.yml
@@ -91,7 +91,15 @@ jobs:
         GPG_SIGNING_KEY_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}
         GPG_SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
       run: |
-        ./gradlew publish \
+        ./gradlew :superwall:publish \
+          -Paws_access_key_id=$AWS_ACCESS_KEY_ID \
+          -Paws_secret_access_key=$AWS_SECRET_ACCESS_KEY \
+          -PsonatypeUsername=$SONATYPE_USERNAME \
+          -PsonatypePassword=$SONATYPE_PASSWORD \
+          -Pgpg_signing_key_passphrase=$GPG_SIGNING_KEY_PASSPHRASE \
+          -Pgpg_signing_key_id=$GPG_SIGNING_KEY_ID
+
+        ./gradlew :superwall-compose:publish \
           -Paws_access_key_id=$AWS_ACCESS_KEY_ID \
           -Paws_secret_access_key=$AWS_SECRET_ACCESS_KEY \
           -PsonatypeUsername=$SONATYPE_USERNAME \
@@ -143,7 +151,7 @@ jobs:
         GPG_SIGNING_KEY_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}
         GPG_SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
       run: |
-        ./gradlew publish \
+        ./gradlew :superwall:publish \
           -Paws_access_key_id=$AWS_ACCESS_KEY_ID \
           -Paws_secret_access_key=$AWS_SECRET_ACCESS_KEY \
           -PsonatypeUsername=$SONATYPE_USERNAME \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+## 2.0.0-Alpha
+
+- Removes `PaywallComposable` and Jetpack Compose support from main SDK
+- Adds `Superwall-Compose` module for Jetpack Compose support:
+    - You can find it at `com.superwall.sdk:superwall-compose:2.0.0-alpha`
+- Adds consumer proguard rules to enable consumer minification
+- Removed methods previously marked as Deprecated
+
 ## 1.5.0
 
 ### Enhancements
@@ -14,8 +22,7 @@ The changelog for `Superwall`. Also see the [releases](https://github.com/superw
 
 ### Fixes
 
-- Fixes concurrency issues with subscriptions triggered in Cordova apps 
-
+- Fixes concurrency issues with subscriptions triggered in Cordova apps
 ## 1.5.0-beta.2
 
 ## Enhancements

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ The preferred installation method is with [Gradle](https://superwall.com/docs/in
 
   <!-- (2) Add these lines -->
   <activity
-    android:name="com.superwall.sdk.paywall.vc.SuperwallPaywallActivity"
+    android:name="com.superwall.sdk.paywall.view.SuperwallPaywallActivity"
     android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
     android:configChanges="orientation|screenSize|keyboardHidden">
   </activity>

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId = "com.superwall.superapp"
-        minSdk = 26
+        minSdk = 22
         targetSdk = 34
         versionCode = 2
         versionName = "1.0.0"
@@ -80,6 +80,7 @@ dependencies {
 
     // Superwall
     implementation(project(":superwall"))
+    implementation(project(":superwall-compose"))
 
     // Test
     testImplementation(libs.junit)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/com/example/superapp/test/FlowScreenshotTestExecutor.kt b/app/src/androidTest/java/com/example/superapp/test/FlowScreenshotTestExecutor.kt
@@ -1,6 +1,7 @@
 @file:Suppress("ktlint:standard:no-empty-file")
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import com.dropbox.dropshots.Dropshots
 import com.dropbox.dropshots.ThresholdValidator
 import com.example.superapp.utils.CustomComparator
@@ -32,7 +33,7 @@ class FlowScreenshotTestExecutor {
 
     val mainScope = CoroutineScope(Dispatchers.Main)
 
-    /*@Test
+    @Test
     @FlakyTest
     fun test_paywall_reappers_with_video() =
         with(dropshots) {
@@ -44,12 +45,13 @@ class FlowScreenshotTestExecutor {
                     delayFor(500.milliseconds)
                 }
                 step("second_paywall") {
+                    it.waitFor { it is SuperwallEvent.PaywallOpen }
                     awaitUntilWebviewAppears()
                     delayFor(1.seconds)
                 }
             }
         }
-*/
+
     @Test
     fun test_paywall_presents_regardless_of_subscription() =
         with(dropshots) {
@@ -65,7 +67,7 @@ class FlowScreenshotTestExecutor {
                             Superwall.instance.paywallView
                                 ?.webView
                                 ?.scrollBy(0, 300) ?: kotlin.run {
-                                throw IllegalStateException("No viewcontroller found")
+                                throw IllegalStateException("No view found")
                             }
                         }.await()
                     // We delay a bit to ensure the button is visible
@@ -76,7 +78,7 @@ class FlowScreenshotTestExecutor {
                             Superwall.instance.paywallView
                                 ?.webView
                                 ?.scrollTo(0, 0) ?: kotlin.run {
-                                throw IllegalStateException("No viewcontroller found")
+                                throw IllegalStateException("No view found")
                             }
                         }.await()
                     // We delay a bit to ensure scroll has finished
@@ -123,16 +125,21 @@ class FlowScreenshotTestExecutor {
                 }
             }
         }
+}
+
+    /*
+
+    Commented out due to inability to re-record tests until Firebase Android Studio plugin is fixed
 
     @Test
     fun test_paywall_presents_then_dismisses_without_reappearing() =
         with(dropshots) {
             screenshotFlow(UITestHandler.test14Info) {
                 step {
-                    it.waitFor { it is SuperwallEvent.PaywallWebviewLoadComplete }
+                    it.waitFor { it is SuperwallEvent.ShimmerViewComplete }
                     awaitUntilShimmerDisappears()
                     awaitUntilWebviewAppears()
-                    delayFor(100.milliseconds)
+                    delayFor(300.milliseconds)
                     mainScope
                         .async {
                             // We scroll a bit to display the button
@@ -146,7 +153,7 @@ class FlowScreenshotTestExecutor {
                                 }
                         }.await()
                     // We delay a bit to ensure the button is visible
-                    delayFor(100.milliseconds)
+                    delayFor(300.milliseconds)
                     // We scroll back to the top
                     mainScope
                         .async {
@@ -159,10 +166,7 @@ class FlowScreenshotTestExecutor {
                     // We delay a bit to ensure scroll has finished
                     delayFor(500.milliseconds)
                 }
-
-                step {
-                    delayFor(10.seconds)
-                }
             }
         }
 }
+     */
diff --git a/app/src/androidTest/java/com/example/superapp/test/PresentationRuleTests.kt b/app/src/androidTest/java/com/example/superapp/test/PresentationRuleTests.kt
@@ -73,7 +73,7 @@ class PresentationRuleTests {
         with(dropshots) {
             screenshotFlow(UITestHandler.test32Info) {
                 step("") {
-                    it.waitFor { it is SuperwallEvent.SubscriptionStatusDidChange }
+                    it.waitFor { it is SuperwallEvent.EntitlementStatusDidChange }
                     delayFor(1.seconds)
                 }
             }

diff --git a/app/src/androidTest/java/com/example/superapp/test/SimpleScreenshotTestExecutor.kt b/app/src/androidTest/java/com/example/superapp/test/SimpleScreenshotTestExecutor.kt
@@ -14,7 +14,6 @@ import com.example.superapp.utils.screenshotFlow
 import com.example.superapp.utils.waitFor
 import com.superwall.sdk.Superwall
 import com.superwall.sdk.analytics.superwall.SuperwallEvent
-import com.superwall.sdk.delegate.SubscriptionStatus
 import com.superwall.superapp.test.UITestHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -144,19 +143,21 @@ class SimpleScreenshotTestExecutor {
                     it.waitFor { it is SuperwallEvent.PaywallPresentationRequest }
                 }
             }
-            Superwall.instance.setSubscriptionStatus(SubscriptionStatus.INACTIVE)
         }
 
-    @Test
-    fun test_paywall_doesnt_present_without_showing_alert_after_dismiss() =
-        with(dropshots) {
-            screenshotFlow(UITestHandler.test26Info) {
-                step("") {
-                    it.waitFor { it is SuperwallEvent.PaywallPresentationRequest }
-                    awaitUntilDialogAppears()
-                }
-            }
-        }
+    /*
+     * Commented out temporarily since Firebase remote lab connection is broken and recording tests is not possible
+     * @Test
+     * fun test_paywall_presents_without_showing_alert_after_dismiss() =
+     *    with(dropshots) {
+     *        screenshotFlow(UITestHandler.test26Info) {
+     *            step("") {
+     *                it.waitFor { it is SuperwallEvent.PaywallPresentationRequest }
+     *                awaitUntilDialogAppears()
+     *            }
+     *        }
+     *    }
+     * */
 
     @Test
     fun test_paywall_doesnt_present_calls_feature_block() =

diff --git a/app/src/androidTest/java/com/example/superapp/utils/TestingUtils.kt b/app/src/androidTest/java/com/example/superapp/utils/TestingUtils.kt
@@ -17,7 +17,8 @@ import androidx.test.uiautomator.Until
 import com.dropbox.dropshots.Dropshots
 import com.superwall.sdk.Superwall
 import com.superwall.sdk.analytics.superwall.SuperwallEvent
-import com.superwall.sdk.paywall.vc.ShimmerView
+import com.superwall.sdk.config.models.ConfigurationStatus
+import com.superwall.sdk.paywall.view.ShimmerView
 import com.superwall.superapp.MainActivity
 import com.superwall.superapp.test.UITestInfo
 import kotlinx.coroutines.CoroutineScope
@@ -112,6 +113,7 @@ fun Dropshots.screenshotFlow(
     }
 
     runTest(timeout = 5.minutes) {
+        Superwall.instance.configurationStateListener.first { it is ConfigurationStatus.Configured }
         try {
             flow.steps.forEach {
                 if (!testReady.value) {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.superwall.sdk.paywall.vc.SuperwallPaywallActivity"
+            android:name="com.superwall.sdk.paywall.view.SuperwallPaywallActivity"
             android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
             android:configChanges="orientation|screenSize|keyboardHidden">
         </activity>

diff --git a/app/src/main/java/com/superwall/superapp/ComposeActivity.kt b/app/src/main/java/com/superwall/superapp/ComposeActivity.kt
@@ -25,11 +25,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import com.superwall.sdk.composable.PaywallComposable
+import com.superwall.sdk.compose.PaywallComposable
 import com.superwall.sdk.paywall.presentation.internal.request.PaywallOverrides
 import com.superwall.sdk.paywall.presentation.internal.state.PaywallResult
-import com.superwall.sdk.paywall.vc.PaywallView
-import com.superwall.sdk.paywall.vc.delegate.PaywallViewCallback
+import com.superwall.sdk.paywall.view.PaywallView
+import com.superwall.sdk.paywall.view.delegate.PaywallViewCallback
 import com.superwall.superapp.ui.theme.MyApplicationTheme
 
 class ComposeActivity :

diff --git a/app/src/main/java/com/superwall/superapp/MainApplication.kt b/app/src/main/java/com/superwall/superapp/MainApplication.kt
@@ -13,6 +13,7 @@ import com.superwall.sdk.delegate.SuperwallDelegate
 import com.superwall.sdk.logger.LogLevel
 import com.superwall.sdk.logger.LogScope
 import com.superwall.sdk.paywall.presentation.register
+import com.superwall.superapp.purchase.RevenueCatPurchaseController
 import kotlinx.coroutines.flow.MutableSharedFlow
 import java.lang.ref.WeakReference
 
@@ -62,7 +63,7 @@ class MainApplication :
                 .build(),
         )
 
-        configureWithAutomaticInitialization()
+        configureWithObserverMode()
 //        configureWithRevenueCatInitialization()
     }
 
@@ -86,6 +87,25 @@ class MainApplication :
         // Superwall.instance.options.isGameControllerEnabled = true
     }
 
+    fun configureWithObserverMode() {
+        Superwall.configure(
+            this@MainApplication,
+            CONSTANT_API_KEY,
+            options =
+                SuperwallOptions().apply {
+                    shouldObservePurchases = true
+                    paywalls =
+                        PaywallOptions().apply {
+                            shouldPreload = false
+                        }
+                },
+        )
+        Superwall.instance.delegate = this@MainApplication
+
+        // Make sure we enable the game controller
+        // Superwall.instance.options.isGameControllerEnabled = true
+    }
+
     fun configureWithRevenueCatInitialization() {
         val purchaseController = RevenueCatPurchaseController(this)
 

diff --git a/app/src/main/java/com/superwall/superapp/purchase/RevenueCatPurchaseController.kt b/app/src/main/java/com/superwall/superapp/purchase/RevenueCatPurchaseController.kt
@@ -1,4 +1,4 @@
-package com.superwall.superapp
+package com.superwall.superapp.purchase
 
 import android.app.Activity
 import android.content.Context
@@ -24,8 +24,9 @@ import com.revenuecat.purchases.purchaseWith
 import com.superwall.sdk.Superwall
 import com.superwall.sdk.delegate.PurchaseResult
 import com.superwall.sdk.delegate.RestorationResult
-import com.superwall.sdk.delegate.SubscriptionStatus
 import com.superwall.sdk.delegate.subscription_controller.PurchaseController
+import com.superwall.sdk.models.entitlements.Entitlement
+import com.superwall.sdk.models.entitlements.EntitlementStatus
 import kotlinx.coroutines.CompletableDeferred
 
 // Extension function to convert callback to suspend function
@@ -126,9 +127,16 @@ class RevenueCatPurchaseController(
         // Refetch the customer info on load
         Purchases.sharedInstance.getCustomerInfoWith {
             if (hasAnyActiveEntitlements(it)) {
-                setSubscriptionStatus(SubscriptionStatus.ACTIVE)
+                setEntitlementStatus(
+                    EntitlementStatus.Active(
+                        it.entitlements.active
+                            .map {
+                                Entitlement(it.key, Entitlement.Type.SERVICE_LEVEL)
+                            }.toSet(),
+                    ),
+                )
             } else {
-                setSubscriptionStatus(SubscriptionStatus.INACTIVE)
+                setEntitlementStatus(EntitlementStatus.Inactive)
             }
         }
     }
@@ -138,9 +146,16 @@ class RevenueCatPurchaseController(
      */
     override fun onReceived(customerInfo: CustomerInfo) {
         if (hasAnyActiveEntitlements(customerInfo)) {
-            setSubscriptionStatus(SubscriptionStatus.ACTIVE)
+            setEntitlementStatus(
+                EntitlementStatus.Active(
+                    customerInfo.entitlements.active
+                        .map {
+                            Entitlement(it.key, Entitlement.Type.SERVICE_LEVEL)
+                        }.toSet(),
+                ),
+            )
         } else {
-            setSubscriptionStatus(SubscriptionStatus.INACTIVE)
+            setEntitlementStatus(EntitlementStatus.Inactive)
         }
     }
 
@@ -275,9 +290,9 @@ class RevenueCatPurchaseController(
         return entitlements.isNotEmpty()
     }
 
-    private fun setSubscriptionStatus(subscriptionStatus: SubscriptionStatus) {
+    private fun setEntitlementStatus(entitlementStatus: EntitlementStatus) {
         if (Superwall.initialized) {
-            Superwall.instance.setSubscriptionStatus(subscriptionStatus)
+            Superwall.instance.setEntitlementStatus(entitlementStatus)
         }
     }
 }