From 2320201f895530d127441b15317bb6a557820396 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 27 Mar 2022 18:07:18 +0530
Subject: Migrate namespaces to Gradle (#1805)

* ui-compose: update Gradle configuration

* gradle: fix namespace for a couple astray Compose dependencies

* all: switch to Gradle namespace property

Mirrors a similar change from AndroidX https://github.com/androidx/androidx/commit/dcfa035a961fd1daabb7dcccf97d77fa2a006abf
---
 ui-compose/build.gradle.kts             | 25 ++++++++++++++++---------
 ui-compose/src/main/AndroidManifest.xml |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'ui-compose')

diff --git a/ui-compose/build.gradle.kts b/ui-compose/build.gradle.kts
index e84b0ac1..19b06532 100644
--- a/ui-compose/build.gradle.kts
+++ b/ui-compose/build.gradle.kts
@@ -4,14 +4,21 @@ plugins {
   id("com.github.android-password-store.kotlin-library")
 }
 
+android {
+  buildFeatures {
+    compose = true
+    composeOptions {
+      useLiveLiterals = false
+      kotlinCompilerExtensionVersion = libs.versions.compose.get()
+    }
+  }
+  namespace = "dev.msfjarvis.aps.ui.compose"
+}
+
 dependencies {
-  implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.hilt.compose)
-  implementation(libs.compose.foundation.core)
-  implementation(libs.compose.foundation.layout)
-  implementation(libs.compose.material)
-  implementation(libs.androidx.compose.material3)
-  implementation(libs.compose.ui.core)
-  implementation(libs.compose.ui.viewbinding)
-  compileOnly(libs.compose.ui.tooling)
+  api(libs.compose.foundation.core)
+  api(libs.compose.foundation.layout)
+  api(libs.compose.material)
+  api(libs.compose.material3)
+  api(libs.compose.ui.core)
 }
diff --git a/ui-compose/src/main/AndroidManifest.xml b/ui-compose/src/main/AndroidManifest.xml
index 482100e7..e3cc34c8 100644
--- a/ui-compose/src/main/AndroidManifest.xml
+++ b/ui-compose/src/main/AndroidManifest.xml
@@ -3,4 +3,4 @@
   ~ SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
   -->
 
-<manifest package="dev.msfjarvis.aps.ui.compose" />
+<manifest />
-- 
cgit v1.2.3