From 8efc9f697f0d6ab0cab66734a22e4a7ed6fe2d54 Mon Sep 17 00:00:00 2001
From: Hector <hector@emergetools.com>
Date: Fri, 25 Oct 2024 16:47:29 +0100
Subject: [PATCH] [distribution] Update to 0.0.2

---
 android/app/build.gradle.kts                           | 10 ++++++++--
 .../hackernews/features/settings/SettingsScreen.kt     |  2 +-
 android/gradle/libs.versions.toml                      |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 192827c5..d532a691 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -58,10 +58,8 @@ android {
         getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
       )
       if (runningEnv == "release_workflow") {
-        manifestPlaceholders["emerge.distribution.apiKey"] = ""
         signingConfig = signingConfigs.getByName("release")
       } else {
-        manifestPlaceholders["emerge.distribution.apiKey"] = System.getenv("ANDROID_DISTRIBUTION_API_KEY") ?: ""
         signingConfig = signingConfigs.getByName("debug")
       }
     }
@@ -100,6 +98,14 @@ emerge {
     publishableApiKey.set(System.getenv("REAPER_API_KEY"))
   }
 
+  distribution {
+    // Don't enable distribution on release workflow
+    if (runningEnv != "release_workflow") {
+      enabledVariants.set(listOf("release"))
+    }
+    apiKey.set(System.getenv("ANDROID_DISTRIBUTION_API_KEY") ?: "")
+  }
+
   vcs {
     gitHub {
       repoName.set("hackernews")
diff --git a/android/app/src/main/java/com/emergetools/hackernews/features/settings/SettingsScreen.kt b/android/app/src/main/java/com/emergetools/hackernews/features/settings/SettingsScreen.kt
index 3b876e76..28b87f3a 100644
--- a/android/app/src/main/java/com/emergetools/hackernews/features/settings/SettingsScreen.kt
+++ b/android/app/src/main/java/com/emergetools/hackernews/features/settings/SettingsScreen.kt
@@ -91,7 +91,7 @@ fun SettingsScreen(
         }
       )
       Spacer(modifier = Modifier.height(8.dp))
-      if (Distribution.isEnabled(LocalContext.current)) {
+      if (Distribution.isEnabled()) {
         SettingsSectionLabel("Version")
         VersionCard()
         Spacer(modifier = Modifier.height(8.dp))
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index d12d7313..e5bf907b 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -14,10 +14,10 @@ kotlinx-serialization-json = "1.7.3"
 viewmodel = "2.8.6"
 navigation = "2.8.2"
 browser = "1.8.0"
-emergePlugin = "4.0.2"
+emergePlugin = "4.0.3"
 emergeSnapshots = "1.3.0-rc01"
 emergeReaper = "1.0.0-rc02"
-emergeDistribution = "0.0.1"
+emergeDistribution = "0.0.2"
 sentry = "4.11.0"
 shapes = "1.0.1"
 datastore = "1.1.1"