fix: android fix when passing compileSdk as gradle arg

Author: farfromrefug

lib/services/android/gradle-build-args-service.ts

@@ -57,7 +57,7 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 
 		args.push(
 			`--stacktrace`,
-			`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`,
+			`-PcompileSdk=${toolsInfo.compileSdkVersion}`,
 			`-PtargetSdk=${toolsInfo.targetSdkVersion}`,
 			`-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`,
 			`-PgenerateTypings=${toolsInfo.generateTypings}`,

test/services/android/gradle-build-args-service.ts

@@ -63,7 +63,7 @@ const expectedInfoLoggingArgs = ["--quiet"];
 const expectedTraceLoggingArgs = ["--debug"];
 const expectedDebugBuildArgs = [
 	"--stacktrace",
-	"-PcompileSdk=android-28",
+	"-PcompileSdk=28",
 	"-PtargetSdk=26",
 	"-PbuildToolsVersion=my-build-tools-version",
 	"-PgenerateTypings=true",

vendor/gradle-app/app/build.gradle

@@ -86,8 +86,8 @@ def pluginsJarLibraries = new LinkedList<String>()
 def allJarLibraries = new LinkedList<String>()
 
 def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk as int : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk as int : NS_DEFAULT_COMPILE_SDK_VERSION as int }
 def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String
 }