refactor: make the build plugin service not use platformData

Author: plamen5kov

lib/definitions/android-plugin-migrator.d.ts

@@ -3,8 +3,7 @@ interface IBuildOptions {
     platformsAndroidDirPath: string,
     pluginName: string,
     aarOutputDir: string,
-    tempPluginDirPath: string,
-    platformData: IPlatformData //don't make optional! (makes sure the plugins are built with the same parameters as the project),
+    tempPluginDirPath: string
 }
 
 interface IAndroidPluginBuildService {

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

@@ -7,7 +7,8 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 
 	constructor(private $fs: IFileSystem,
 		private $childProcess: IChildProcess,
-		private $hostInfo: IHostInfo) { }
+		private $hostInfo: IHostInfo,
+		private $androidToolsInfo: IAndroidToolsInfo) { }
 
 	private static ANDROID_MANIFEST_XML = "AndroidManifest.xml";
 	private static INCLUDE_GRADLE = "include.gradle";
@@ -270,15 +271,21 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 
 			// finally build the plugin
 			const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew";
-			let localArgs = [
+			const localArgs = [
 				gradlew,
 				"-p",
 				newPluginDir,
 				"assembleRelease"
 			];
 
-			const projectBuildOptions = options.platformData.platformProjectService.getBuildOptions();
-			localArgs = localArgs.concat(projectBuildOptions);
+			this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true });
+
+			const androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
+			const compileSdk = androidToolsInfo.compileSdkVersion;
+			const buildToolsVersion = androidToolsInfo.buildToolsVersion;
+
+			localArgs.push(`-PcompileSdk=android-${compileSdk}`);
+			localArgs.push(`-PbuildToolsVersion=${buildToolsVersion}`);
 
 			try {
 				await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir });

lib/services/android-project-service.ts

@@ -429,13 +429,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			// build Android plugins which contain AndroidManifest.xml and/or resources
 			const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
 			if (this.$fs.exists(pluginPlatformsFolderPath)) {
-				const platformData = this.getPlatformData(projectData);
 				const options: IBuildOptions = {
 					pluginName: pluginData.name,
 					platformsAndroidDirPath: pluginPlatformsFolderPath,
 					aarOutputDir: pluginPlatformsFolderPath,
-					tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin"),
-					platformData: platformData
+					tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin")
 				};
 
 				this.prebuildNativePlugin(options);

lib/services/gradle-plugin/build.gradle

@@ -20,7 +20,6 @@ allprojects {
 apply plugin: 'com.android.library'
 
 def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 24 }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 24 }
 def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1"
 }
@@ -30,8 +29,7 @@ android {
     buildToolsVersion computeBuildToolsVersion()
 
     defaultConfig {
-        minSdkVersion 17
-        targetSdkVersion computeTargetSdkVersion()
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }

lib/services/livesync/livesync-service.ts

@@ -476,8 +476,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 							pluginName: item.pluginName,
 							platformsAndroidDirPath: item.platformsAndroidDirPath,
 							aarOutputDir: item.platformsAndroidDirPath,
-							tempPluginDirPath: path.join(projectData.platformsDir, 'tempPlugin'),
-							platformData: platformData
+							tempPluginDirPath: path.join(projectData.platformsDir, 'tempPlugin')
 						};
 						pluginInfo.push(options);
 					});
@@ -600,8 +599,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 													pluginName: pluginPackageJason.name,
 													platformsAndroidDirPath: pluginInputOutputPath,
 													aarOutputDir: pluginInputOutputPath,
-													tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin"),
-													platformData: platformData
+													tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin")
 												};
 												pluginInfo.push(options);
 											}