Update compose version & remove namespace from manifest files

instacart · Dec 14, 2023 · 7a9e9af · 7a9e9af
1 parent 7e057be
commit 7a9e9af
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<manifest package="com.instacart.formula.android.compose"/>
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>