Skip to content

Commit 2ffdce9

Browse files
committed
chore: fix after merge
1 parent b5c3396 commit 2ffdce9

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
} from "../common/declarations";
3535
import { IFilesHashService } from "../definitions/files-hash-service";
3636
import { IInjector } from "../common/definitions/yok";
37+
import { IAndroidToolsInfo } from "../declarations";
3738
import { injector } from "../common/yok";
3839
import * as _ from "lodash";
3940
import { resolvePackageJSONPath } from "@rigor789/resolve-package-path";
@@ -47,6 +48,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
4748
constructor(
4849
private $fs: IFileSystem,
4950
private $childProcess: IChildProcess,
51+
private $androidToolsInfo: IAndroidToolsInfo,
5052
private $hostInfo: IHostInfo,
5153
private $options: IOptions,
5254
private $logger: ILogger,
@@ -783,14 +785,16 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
783785
const gradlew =
784786
pluginBuildSettings.gradlePath ??
785787
(this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
786-
788+
const toolsInfo = this.$androidToolsInfo.getToolsInfo({
789+
projectDir: this.$projectData.projectDir,
790+
});
787791
const localArgs = [
788792
"-p",
789793
pluginBuildSettings.pluginDir,
790794
"assembleRelease",
791795
`-PtempBuild=true`,
792-
`-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
793-
`-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
796+
`-PcompileSdk=${toolsInfo.compileSdkVersion}`,
797+
`-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`,
794798
`-PprojectRoot=${this.$projectData.projectDir}`,
795799
`-DprojectRoot=${this.$projectData.projectDir}`, // we need it as a -D to be able to read it from settings.gradle
796800
`-PappPath=${this.$projectData.getAppDirectoryPath()}`,

0 commit comments

Comments
 (0)