Skip to content

Commit 58a0e60

Browse files
committed
fix: gradle build error when building some plugins
1 parent 89c67d0 commit 58a0e60

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

vendor/gradle-plugin/build.gradle

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import groovy.json.JsonSlurper
2+
import org.gradle.internal.logging.text.StyledTextOutputFactory
3+
import static org.gradle.internal.logging.text.StyledTextOutput.Style
24

35
apply plugin: 'com.android.library'
46
apply plugin: 'kotlin-android'
@@ -20,6 +22,10 @@ buildscript {
2022
// in the individual module build.gradle files
2123
}
2224

25+
// Set up styled logger
26+
project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
27+
28+
// todo: pass appResourcesPath from CLI as a gradle arg
2329
project.ext.getAppResourcesPath = { ->
2430
def relativePathToApp = "app"
2531
def relativePathToAppResources
@@ -54,14 +60,14 @@ buildscript {
5460
def pathToBuildScriptGradle = "$absolutePathToAppResources/Android/buildscript.gradle"
5561
def buildScriptGradle = file(pathToBuildScriptGradle)
5662
if (buildScriptGradle.exists()) {
57-
outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined buildscript from ${buildScriptGradle}"
63+
outLogger.withStyle(Style.SuccessHeader).println "\t ~ applying user-defined buildscript from ${buildScriptGradle}"
5864
apply from: pathToBuildScriptGradle, to: buildscript
5965
}
6066

6167
def pathToPluginBuildScriptGradle = "$rootDir/buildscript.gradle"
6268
def pluginBuildScriptGradle = file(pathToPluginBuildScriptGradle)
6369
if (pluginBuildScriptGradle.exists()) {
64-
outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined buildscript from dependency ${pluginBuildScriptGradle}"
70+
outLogger.withStyle(Style.SuccessHeader).println "\t ~ applying user-defined buildscript from dependency ${pluginBuildScriptGradle}"
6571
apply from: pathToPluginBuildScriptGradle, to: buildscript
6672
}
6773
}
@@ -122,7 +128,7 @@ def applyBeforePluginGradleConfiguration() {
122128
def pathToBeforePluginGradle = "$appResourcesPath/Android/before-plugins.gradle"
123129
def beforePluginGradle = file(pathToBeforePluginGradle)
124130
if (beforePluginGradle.exists()) {
125-
println "\t + applying user-defined configuration from ${beforePluginGradle}"
131+
outLogger.withStyle(Style.SuccessHeader).println "\t ~ applying user-defined configuration from ${beforePluginGradle}"
126132
apply from: pathToBeforePluginGradle
127133
}
128134
}

0 commit comments

Comments
 (0)