From 7a9e9af69e19905118e4b2295166d652a9e82f17 Mon Sep 17 00:00:00 2001
From: Matt Kranzler <matt.kranzler@instacart.com>
Date: Thu, 14 Dec 2023 08:26:42 -0800
Subject: [PATCH] Update compose version & remove namespace from manifest files

---
 formula-android-compose/src/main/AndroidManifest.xml           | 2 +-
 formula-android-tests/src/main/AndroidManifest.xml             | 3 +--
 formula-android/src/main/AndroidManifest.xml                   | 2 +-
 gradle/libs.versions.toml                                      | 2 +-
 samples/composition/src/main/AndroidManifest.xml               | 3 +--
 samples/counter/src/main/AndroidManifest.xml                   | 3 +--
 .../custom-network-state-stream/src/main/AndroidManifest.xml   | 3 +--
 samples/stopwatch-compose/src/main/AndroidManifest.xml         | 3 +--
 samples/stopwatch-coroutines/src/main/AndroidManifest.xml      | 3 +--
 samples/stopwatch/src/main/AndroidManifest.xml                 | 3 +--
 samples/todoapp/src/main/AndroidManifest.xml                   | 3 +--
 11 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/formula-android-compose/src/main/AndroidManifest.xml b/formula-android-compose/src/main/AndroidManifest.xml
index 42519c3f1..c4e6c98d7 100644
--- a/formula-android-compose/src/main/AndroidManifest.xml
+++ b/formula-android-compose/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.instacart.formula.android.compose"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/formula-android-tests/src/main/AndroidManifest.xml b/formula-android-tests/src/main/AndroidManifest.xml
index 4ff543a83..c48ff6712 100644
--- a/formula-android-tests/src/main/AndroidManifest.xml
+++ b/formula-android-tests/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:label="@string/app_name"
diff --git a/formula-android/src/main/AndroidManifest.xml b/formula-android/src/main/AndroidManifest.xml
index ca7d3e564..c4e6c98d7 100644
--- a/formula-android/src/main/AndroidManifest.xml
+++ b/formula-android/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.instacart.formula.android"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4f8c4b6b7..700d37eab 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ dokka-gradle = "1.4.32"
 
 kotlin = "1.9.20"
 coroutines = "1.5.2"
-compose = "1.0.1"
+compose = "1.5.4"
 
 androidX = "1.2.0"
 lifecycle = "2.2.0"
diff --git a/samples/composition/src/main/AndroidManifest.xml b/samples/composition/src/main/AndroidManifest.xml
index 5c78cc3da..45a0419db 100644
--- a/samples/composition/src/main/AndroidManifest.xml
+++ b/samples/composition/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula.samples.composition">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:label="@string/app_name"
diff --git a/samples/counter/src/main/AndroidManifest.xml b/samples/counter/src/main/AndroidManifest.xml
index 1793d76ff..5e7028ff6 100644
--- a/samples/counter/src/main/AndroidManifest.xml
+++ b/samples/counter/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula.counter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:label="@string/app_name"
diff --git a/samples/custom-network-state-stream/src/main/AndroidManifest.xml b/samples/custom-network-state-stream/src/main/AndroidManifest.xml
index 168eb41a4..3eaf77d7c 100644
--- a/samples/custom-network-state-stream/src/main/AndroidManifest.xml
+++ b/samples/custom-network-state-stream/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula.samples.networkstate">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application android:allowBackup="true"
diff --git a/samples/stopwatch-compose/src/main/AndroidManifest.xml b/samples/stopwatch-compose/src/main/AndroidManifest.xml
index cd28c71b3..ede290b6a 100644
--- a/samples/stopwatch-compose/src/main/AndroidManifest.xml
+++ b/samples/stopwatch-compose/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula.compose.stopwatch">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".StopwatchApp"
diff --git a/samples/stopwatch-coroutines/src/main/AndroidManifest.xml b/samples/stopwatch-coroutines/src/main/AndroidManifest.xml
index 4f77e7dff..6d15095b0 100644
--- a/samples/stopwatch-coroutines/src/main/AndroidManifest.xml
+++ b/samples/stopwatch-coroutines/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula.stopwatch">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:label="@string/app_name"
diff --git a/samples/stopwatch/src/main/AndroidManifest.xml b/samples/stopwatch/src/main/AndroidManifest.xml
index 4f77e7dff..6d15095b0 100644
--- a/samples/stopwatch/src/main/AndroidManifest.xml
+++ b/samples/stopwatch/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula.stopwatch">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:label="@string/app_name"
diff --git a/samples/todoapp/src/main/AndroidManifest.xml b/samples/todoapp/src/main/AndroidManifest.xml
index ed3627a04..849ff885b 100644
--- a/samples/todoapp/src/main/AndroidManifest.xml
+++ b/samples/todoapp/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.examples.todoapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".TodoApp"