File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed
gradle-conventions-settings/src/main/kotlin Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -87,7 +87,8 @@ pluginManagement {
87
87
88
88
repositories {
89
89
val useProxyProperty = getLocalProperties()[" kotlinx.rpc.useProxyRepositories" ] as String?
90
- val useProxy = useProxyProperty == null || useProxyProperty == " true"
90
+ val useProxy = (useProxyProperty == null || useProxyProperty == " true" ) &&
91
+ settings.providers.gradleProperty(" kotlinx.rpc.useProxyRepositories" ).orNull != " false"
91
92
92
93
if (useProxy) {
93
94
buildDeps()
@@ -194,11 +195,12 @@ settings.extra["useProxyRepositories"] = localProps.isUsingProxyRepositories()
194
195
195
196
gradle.rootProject {
196
197
allprojects {
198
+ val useProxy = localProps.isUsingProxyRepositories() &&
199
+ project.findProperty(" kotlinx.rpc.useProxyRepositories" ) != " false"
200
+
197
201
this .extra[" spacePassword" ] = getSpacePassword()
198
202
this .extra[" localProperties" ] = localProps
199
- this .extra[" useProxyRepositories" ] = localProps.isUsingProxyRepositories()
200
-
201
- val useProxy = localProps.isUsingProxyRepositories()
203
+ this .extra[" useProxyRepositories" ] = useProxy
202
204
203
205
val globalRootDir = findGlobalRootDirPath()
204
206
You can’t perform that action at this time.
0 commit comments