From 814e49be4922e05a67c9a782c65e0de0d6549af7 Mon Sep 17 00:00:00 2001
From: Gray Mackall <34871572+gmackall@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:17:41 -0700
Subject: [PATCH] Upgrade module template AGP version (#151675)

Follow up to https://github.com/flutter/flutter/pull/151433.
---
 .../lib/src/android/gradle_utils.dart            |  2 +-
 .../Flutter.tmpl/build.gradle.tmpl               | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/flutter_tools/lib/src/android/gradle_utils.dart b/packages/flutter_tools/lib/src/android/gradle_utils.dart
index b3d3746f0c2..d361cb2fd0c 100644
--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart
+++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
@@ -28,7 +28,7 @@ import 'android_sdk.dart';
 // Please see the README before changing any of these values.
 const String templateDefaultGradleVersion = '8.3';
 const String templateAndroidGradlePluginVersion = '8.1.0';
-const String templateAndroidGradlePluginVersionForModule = '7.3.0';
+const String templateAndroidGradlePluginVersionForModule = '8.1.0';
 const String templateKotlinGradlePluginVersion = '1.8.22';
 
 // The Flutter Gradle Plugin is only applied to app projects, and modules that
diff --git a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
index 5220e77c97c..a128098b761 100644
--- a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
@@ -47,6 +47,22 @@ android {
     }
 }
 
+android.buildTypes.all {buildType ->
+    if (!android.productFlavors.isEmpty()) {
+        android.productFlavors.all{productFlavor ->
+            android.publishing.singleVariant(productFlavor.name + buildType.name.capitalize()) {
+                withSourcesJar()
+                withJavadocJar()
+            }
+        }
+    } else {
+        android.publishing.singleVariant(buildType.name) {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
+
 flutter {
     source = "../.."
 }