Ir/feature/web2app

.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 \

CHANGELOG.md

@@ -2,6 +2,75 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+# 2.0.0-beta.4
+
+## Breaking changes
+- `SuperwallEvents.entitlementStatusDidChange` has been renamed to `SuperwallEvents.subscriptionStatusDidChange`
+- `SuperwallDelegate.entitlementStatusDidChange` has been renamed to `SuperwallEvents.entitlementStatusDidChange`
+- `TriggerResult.NoRuleMatch` and `TriggerResult.EventNotFound` have been renamed to `TriggerResult.NoAudienceMatch` and `TriggerResult.PlacementNotFound`
+- `PresentationResult.NoRuleMatch` and `PresentationResult.EventNotFound` have been renamed to `PresentationResult.NoAudienceMatch` and `PresentationResult.PlacementNotFound`
+
+## 2.0.0-beta.3
+
+### Breaking changes
+
+- `SuperwallEvent` has been renamed to `SuperwallPlacement`, belonging properties with `eventName` have been renamed to `placementName`
+- `SuperwallEventInfo` has been renamed to `SuperwallPlacementInfo`
+- `ComputedPropertyRequest.eventName` has been renamed to `ComputedPropertyRequest.placementName`
+- `Superwall.instance.events` has been renamed to `Superwall.instance.placements`
+- `LogScope.events` has been renamed to `LogScope.placements`
+- `PaywallPresentationRequestStatusReason.EventNotFound` has been renamed to `PaywallPresentationRequestStatusReason.PlacementNotFound`
+- `PaywallSkippedReason.EventNotFound` has been renamed to `PaywallSkippedReason.PlacementNotFound`
+- `SuperwallDelegate.handleSuperwallEvent` method has been renamed to `SuperwallDelegate.handleSuperwallPlacement`
+
+## 2.0.0-beta.2
+
+### Breaking Changes
+
+- API Changes:
+  - Migration of `setEntitlementStatus` to `setSubscriptionStatus`
+  - Exposing `Superwall.instance.entitlementsStatus`
+  - Migration of `SuperwallDelegate.entitlementStatusDidChange` to `SuperwallDelegate.subscriptionStatusDidChange`
+
+## 2.0.0-beta.1
+
+## Enhancements
+
+- Add `PaywallBuilder` class as an alternative to existing `getPaywallView` method. This provides a cleaner API and an ability to change purchase loading bar and shimmer view.
+- Add callback versions of new 2.0 methods
+- Ensure safety of static webview calls that are known to fail randomly due to Webview's internal issues
+
+
+## 2.0.0-Alpha.1
+
+### Breaking Changes
+
+- `SuperwallPaywallActivity` and `PaywallView` have been moved into `com.superwall.sdk.paywall.view` package from `com.superwall.sdk.paywall.vc` package.
+- Removes `PaywallComposable` and Jetpack Compose support from the main SDK artifact in favor of `Superwall-Compose` module for Jetpack Compose support:
+  - You can find it at `com.superwall.sdk:superwall-compose:2.0.0-alpha`
+  - Usage remains the same as before, but now you need to include the `superwall-compose` module in your project.
+- Removed methods previously marked as Deprecated
+- Removes `SubscriptionStatus`, together with belonging update methods and `subscriptionStatusDidChange` callback.
+- These are replaced with `EntitlementStatus` and `entitlementStatusDidChange` callback. You can find more details on this migration in our docs.
+
+### Enhancements
+- Adds `purchase` method to `Superwall` you can use to purchase products without having to resort on paywalls. To purchase a product you can pass it in one of the following objects:
+  - Google Play's `ProductDetails`
+  - Superwall's `StoreProduct` object
+  - Or a string containing the product identifier, i.e. `Superwall.instance.purchase("product_id:base_plan:offer")`
+
+- Adds `restorePurchases` method to `Superwall` you can use to handle restoring purchases
+- Adds `getProducts` method to `Superwall` you can use to retrieve a list of `ProductDetails` given the product ID, i.e.  i.e. `Superwall.instance.purchase("product_id:base_plan:offer")`
+
+- Adds support for observing purchases done outside of Superwall paywalls. You can now observe purchases done outside of Superwall paywalls by setting the `shouldObservePurchases` option to true and either:
+  - Manually by calling `Superwall.instance.observe(PurchasingObserverState)` or utility methods `Superwall.instance.observePurchaseStart/observePurchaseError/observePurchaseResult`
+  - Automatically by replacing `launchBillingFlow` with `launchBillingFlowWithSuperwall`. This will automatically observe purchases done outside of Superwall paywalls.
+- Adds consumer proguard rules to enable consumer minification
+- Reduces minSDK to 22
+- Adds `purchaseToken` to purchase events
+- `Superwall.instance` now provides blocking or callback based version of multiple calls, suffixed with `*Sync`
+- Improves preloading performance and reduces impact on the main thread
+
 ## 1.5.5
 
 ## Fixes

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>

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"
@@ -52,8 +52,10 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.0"
     }
-    packagingOptions {
-        resources.excludes += "/META-INF/{AL2.0,LGPL2.1}"
+    packaging {
+        resources.excludes += "META-INF/{AL2.0,LGPL2.1}"
+        resources.excludes += "META-INF/LICENSE.md"
+        resources.excludes += "META-INF/LICENSE-notice.md"
     }
 }
 
@@ -80,6 +82,7 @@ dependencies {
 
     // Superwall
     implementation(project(":superwall"))
+    implementation(project(":superwall-compose"))
 
     // Test
     testImplementation(libs.junit)
@@ -96,10 +99,12 @@ dependencies {
     androidTestImplementation(libs.ui.test.junit4)
     androidTestImplementation(libs.uiautomator)
     androidTestImplementation(libs.test.runner)
+    androidTestImplementation(libs.mockk.android)
+    androidTestImplementation(libs.mockk.core)
     androidTestUtil(libs.orchestrator)
 
     // Debug
-    debugImplementation(libs.leakcanary.android)
+    // debugImplementation(libs.leakcanary.android)
     debugImplementation(libs.ui.tooling)
     debugImplementation(libs.ui.test.manifest)
 }

app/src/androidTest/java/com/example/superapp/test/AlternativeSetupTest.kt

@@ -0,0 +1,121 @@
+package com.example.superapp.test
+
+import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import com.dropbox.dropshots.Dropshots
+import com.dropbox.dropshots.ThresholdValidator
+import com.example.superapp.utils.CustomComparator
+import com.example.superapp.utils.awaitUntilShimmerDisappears
+import com.example.superapp.utils.awaitUntilWebviewAppears
+import com.example.superapp.utils.clickButtonWith
+import com.example.superapp.utils.delayFor
+import com.example.superapp.utils.goBack
+import com.example.superapp.utils.paywallPresentsFor
+import com.example.superapp.utils.screenshotFlow
+import com.superwall.sdk.Superwall
+import com.superwall.sdk.config.options.SuperwallOptions
+import com.superwall.superapp.Keys
+import com.superwall.superapp.test.UITestHandler
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.time.Duration.Companion.milliseconds
+
+@RunWith(AndroidJUnit4::class)
+class AlternativeSetupTest {
+    @get:Rule
+    val dropshots =
+        Dropshots(
+            resultValidator = ThresholdValidator(0.01f),
+            imageComparator = CustomComparator(),
+        )
+
+    @Test
+    fun test_paywall_displays_on_session_start() =
+        with(dropshots) {
+            Superwall.configure(
+                getInstrumentation().targetContext.applicationContext as Application,
+                Keys.SESSION_START_API_KEY,
+                options =
+                    SuperwallOptions().apply {
+                        paywalls.shouldPreload = false
+                    },
+            )
+            paywallPresentsFor(UITestHandler.test50Info)
+        }
+
+    @Test
+    fun test_paywall_displays_on_app_install() =
+        with(dropshots) {
+            Superwall.configure(
+                getInstrumentation().targetContext.applicationContext as Application,
+                Keys.APP_INSTALL_API_KEY,
+                options =
+                    SuperwallOptions().apply {
+                        paywalls.shouldPreload = false
+                    },
+            )
+            paywallPresentsFor(UITestHandler.test52Info)
+        }
+
+    @Test
+    fun test_paywall_displays_on_app_launch() =
+        with(dropshots) {
+            Superwall.configure(
+                getInstrumentation().targetContext.applicationContext as Application,
+                Keys.APP_LAUNCH_API_KEY,
+                options =
+                    SuperwallOptions().apply {
+                        paywalls.shouldPreload = false
+                    },
+            )
+            paywallPresentsFor(UITestHandler.test53Info)
+        }
+/*
+    @Test
+    fun test_paywall_displays_on_deep_link() =
+        with(dropshots) {
+            Superwall.configure(
+                getInstrumentation().targetContext.applicationContext as Application,
+                Keys.DEEP_LINK_OPEN_API_KEY,
+                options =
+                    SuperwallOptions().apply {
+                        paywalls.shouldPreload = false
+                    },
+            )
+            paywallPresentsFor(UITestHandler.test57Info)
+        }
+
+ */
+
+    @Test
+    fun test_paywall_displays_on_decline() =
+        with(dropshots) {
+            Superwall.configure(
+                getInstrumentation().targetContext.applicationContext as Application,
+                Keys.PAYWALL_DECLINE_API_KEY,
+                options =
+                    SuperwallOptions().apply {
+                        paywalls.shouldPreload = false
+                    },
+            )
+            screenshotFlow(UITestHandler.test59Info) {
+                step("1") {
+                    awaitUntilShimmerDisappears()
+                    awaitUntilWebviewAppears()
+                    delayFor(300.milliseconds)
+                }
+                step("decline_for_survey") {
+                    goBack()
+                    delayFor(300.milliseconds)
+                }
+                step("decline_paywall") {
+                    clickButtonWith("Too expensive")
+                    awaitUntilShimmerDisappears()
+                    awaitUntilWebviewAppears()
+                    delayFor(300.milliseconds)
+                }
+            }
+        }
+}