From 4b5df0211e0d366136cabfcf8ab80226a163853a Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Mon, 23 Oct 2023 11:30:37 +0200
Subject: [PATCH] Fix manifest merger

---
 gradle/libs.versions.toml                          | 8 ++++----
 sample-flavors-kotlin/src/main/AndroidManifest.xml | 3 ++-
 sample-kotlin/src/main/AndroidManifest.xml         | 3 ++-
 sample/build.gradle                                | 2 +-
 sample/src/main/AndroidManifest.xml                | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ac091a83..9290df12 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,17 +13,17 @@ agp = { id = "com.android.application", version.ref = "agp-version"}
 
 [versions]
 
-androidx-appcompat = "1.2.0"
+androidx-appcompat = "1.6.1"
 
 androidx-constraintlayout = "1.1.3"
 
 androidx-navigation = "2.3.0"
 
-androidx-test-espresso = "3.4.0"
+androidx-test-espresso = "3.5.1"
 
-androidx-test-ext-junit = "1.1.1"
+androidx-test-ext-junit = "1.1.5"
 
-androidx-test-rules = "1.2.0"
+androidx-test-rules = "1.5.0"
 
 junit-version = "4.13.2"
 
diff --git a/sample-flavors-kotlin/src/main/AndroidManifest.xml b/sample-flavors-kotlin/src/main/AndroidManifest.xml
index e6ae127d..12058c6f 100644
--- a/sample-flavors-kotlin/src/main/AndroidManifest.xml
+++ b/sample-flavors-kotlin/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
     >
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/sample-kotlin/src/main/AndroidManifest.xml b/sample-kotlin/src/main/AndroidManifest.xml
index c6d29b95..4e2143cd 100644
--- a/sample-kotlin/src/main/AndroidManifest.xml
+++ b/sample-kotlin/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
     >
-        <activity android:name="com.osacky.flank.gradle.sample.MainActivity">
+        <activity android:name="com.osacky.flank.gradle.sample.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/sample/build.gradle b/sample/build.gradle
index f20489b5..19dc3426 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -8,7 +8,7 @@ android {
     defaultConfig {
         applicationId "com.osacky.flank.gradle.sample"
         minSdk 23
-        targetSdk 29
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 83c34b4c..95244300 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>