Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 8f00061

Browse files
Merge pull request #1260 from vtrifonov/master
fix: use string concatenation instead of format
2 parents d397ef7 + 8654023 commit 8f00061

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

publish/scripts/installer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,10 +1115,10 @@ task copyMetadata {
11151115
copy {
11161116
if (!project.mergedAssetsOutputPath) {
11171117
// mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.4.0
1118-
project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/\${project.selectedBuildType}/out"
1118+
project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/" + project.selectedBuildType + "/out"
11191119
}
1120-
from "$projectDir/src/main/assets/metadata"
1121-
into "\${project.mergedAssetsOutputPath}/metadata"
1120+
from "$projectDir/src/main/assets/metadata"
1121+
into project.mergedAssetsOutputPath + "/metadata"
11221122
}
11231123
}
11241124
}\`;

src/scripts/postinstall.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5276,7 +5276,7 @@ task copyMetadata {
52765276
if (variant.buildType.name == project.selectedBuildType) {
52775277
def task = provider.get();
52785278
for (File file : task.getOutputs().getFiles()) {
5279-
if(!file.getPath().contains("/incremental/")) {
5279+
if (!file.getPath().contains("/incremental/")) {
52805280
project.ext.mergedAssetsOutputPath = file.getPath()
52815281
}
52825282
}
@@ -5285,12 +5285,12 @@ task copyMetadata {
52855285
}
52865286
doLast {
52875287
copy {
5288-
if(!project.mergedAssetsOutputPath) {
5288+
if (!project.mergedAssetsOutputPath) {
52895289
// mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.4.0
5290-
project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/\${project.selectedBuildType}/out"
5290+
project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/" + project.selectedBuildType + "/out"
52915291
}
52925292
from "$projectDir/src/main/assets/metadata"
5293-
into "\${project.mergedAssetsOutputPath}/metadata"
5293+
into project.mergedAssetsOutputPath + "/metadata"
52945294
}
52955295
}
52965296
}\`;

0 commit comments

Comments
 (0)