Skip to content

Commit c8d021d

Browse files
committed
refactor: when building plugins take CLI generated options
1 parent 6e3650a commit c8d021d

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,16 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
270270

271271
// finally build the plugin
272272
const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew";
273-
const localArgs = [
273+
let localArgs = [
274274
gradlew,
275275
"-p",
276276
newPluginDir,
277277
"assembleRelease"
278278
];
279279

280+
const projectBuildOptions = options.platformData.platformProjectService.getBuildOptions();
281+
localArgs = localArgs.concat(projectBuildOptions);
282+
280283
try {
281284
await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir });
282285
} catch (err) {

lib/services/gradle-plugin/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,19 @@ allprojects {
1919

2020
apply plugin: 'com.android.library'
2121

22+
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 24 }
23+
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 24 }
24+
def computeBuildToolsVersion = { ->
25+
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1"
26+
}
27+
2228
android {
23-
compileSdkVersion 26
24-
buildToolsVersion "26.0.2"
29+
compileSdkVersion computeCompileSdkVersion()
30+
buildToolsVersion computeBuildToolsVersion()
2531

2632
defaultConfig {
2733
minSdkVersion 17
28-
targetSdkVersion 26
34+
targetSdkVersion computeTargetSdkVersion()
2935
versionCode 1
3036
versionName "1.0"
3137
}

0 commit comments

Comments
 (0)