chore: changes to go with merge

Author: farfromrefug

lib/services/android-plugin-build-service.ts

@@ -399,6 +399,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			gradleVersion
 		);
 
+		this.replaceGradleAndroidPluginVersion(
+			buildGradlePath,
+			runtimeGradleVersions.gradleAndroidPluginVersion
+		);
+
 		// In gradle 8 every android project must have a namespace in "android"
 		// and the package property in manifest is now forbidden
 		// let s replace it
@@ -631,6 +636,22 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		);
 	}
 
+	private replaceGradleAndroidPluginVersion(
+		buildGradlePath: string,
+		version: string
+	): void {
+		const gradleAndroidPluginVersionPlaceholder =
+			"{{runtimeAndroidPluginVersion}}";
+		const gradleAndroidPluginVersion =
+			version || AndroidBuildDefaults.GradleAndroidPluginVersion;
+
+		this.replaceFileContent(
+			buildGradlePath,
+			gradleAndroidPluginVersionPlaceholder,
+			gradleAndroidPluginVersion
+		);
+	}
+
 	private replaceFileContent(
 		filePath: string,
 		content: string,

vendor/gradle-plugin/build.gradle

@@ -209,7 +209,7 @@ buildscript {
     applyBuildScriptConfigurations()
 
     def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }
-    def computeBuildToolsVersion = { -> project.hasProperty("androidBuildToolsVersion") ? androidBuildToolsVersion : "${NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION}" }
+    def computeBuildToolsVersion = { -> project.hasProperty("androidBuildToolsVersion") ? androidBuildToolsVersion : "{{runtimeAndroidPluginVersion}}" }
     def kotlinVersion = computeKotlinVersion()
     def androidBuildToolsVersion = computeBuildToolsVersion()