[Paywalls V2] Adds support for Paywalls V2!

.circleci/config.yml

@@ -129,12 +129,6 @@ commands:
       - store_test_results:
           path: ~/gsutil/
 
-  enable-paywalls-v2:
-   steps:
-    - run:
-        name: Enable the Paywall Components build flag
-        command: echo 'revenuecat.flag.paywallComponents=true' >> local.properties
-
 jobs:
 
   assemble-magic-weather-compose-sample-app:
@@ -184,7 +178,6 @@ jobs:
       - run:
           name: Verify purchases-ui target SDK compatibility (currently 34)
           command: ./gradlew :test-apps:testpurchasesuiandroidcompatibility:assembleDebug
-      - enable-paywalls-v2
       - run:
           name: Run Tests
           command: ./gradlew lint test
@@ -372,7 +365,6 @@ jobs:
       - android/accept-licenses
       - android/restore-gradle-cache
       - android/restore-build-cache
-      - enable-paywalls-v2
       - run:
           name: Prepare Keystore
           working_directory: examples/paywall-tester

purchases/build.gradle

@@ -37,15 +37,6 @@ android {
             resources.excludes.add("META-INF/LICENSE.md")
             resources.excludes.add("META-INF/LICENSE-notice.md")
         }
-
-        Properties properties = new Properties()
-        def localProperties = project.rootProject.file('local.properties')
-        if (localProperties.exists()) properties.load(localProperties.newDataInputStream())
-        buildConfigField(
-                "boolean",
-                "FLAG_PAYWALL_COMPONENTS",
-                properties.getOrDefault("revenuecat.flag.paywallComponents", "false")
-        )
     }
 
     testOptions {

purchases/src/main/kotlin/com/revenuecat/purchases/common/OfferingParser.kt

@@ -8,7 +8,6 @@ import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.PackageType
 import com.revenuecat.purchases.PresentedOfferingContext
 import com.revenuecat.purchases.UiConfig
-import com.revenuecat.purchases.api.BuildConfig
 import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.paywalls.PaywallData
 import com.revenuecat.purchases.paywalls.components.common.PaywallComponentsData
@@ -140,17 +139,13 @@ internal abstract class OfferingParser {
 
         @Suppress("TooGenericExceptionCaught")
         val paywallComponentsData: PaywallComponentsData? =
-            if (BuildConfig.FLAG_PAYWALL_COMPONENTS) {
-                offeringJson.optJSONObject("paywall_components")?.let {
-                    try {
-                        json.decodeFromString<PaywallComponentsData>(it.toString())
-                    } catch (e: Throwable) {
-                        errorLog("Error deserializing paywall components data", e)
-                        null
-                    }
+            offeringJson.optJSONObject("paywall_components")?.let {
+                try {
+                    json.decodeFromString<PaywallComponentsData>(it.toString())
+                } catch (e: Throwable) {
+                    errorLog("Error deserializing paywall components data", e)
+                    null
                 }
-            } else {
-                null
             }
 
         val paywallComponents = if (paywallComponentsData != null && uiConfig != null) {