Skip to content

Commit 74b51a5

Browse files
jbachorikclaude
andcommitted
ci: scope Maven proxy to project deps only, not plugins
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 04bac12 commit 74b51a5

6 files changed

Lines changed: 1 addition & 28 deletions

File tree

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ default:
1616
before_script:
1717
- '[ "${CANCELLED:-}" != "true" ] || { echo "No PR for this branch — skipping job"; exit 0; }'
1818
- export ORG_GRADLE_PROJECT_mavenRepositoryProxy=${MAVEN_REPOSITORY_PROXY}
19-
- export ORG_GRADLE_PROJECT_gradlePluginProxy=${MAVEN_REPOSITORY_PROXY}
2019

2120
stages:
2221
- images

.gitlab/scripts/includes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function get_version() {
1010
if [ -z "$gradlecmd" ]; then
1111
gradlecmd="./gradlew"
1212
fi
13-
${gradlecmd} printVersion --max-workers=1 --build-cache --stacktrace --info --no-watch-fs --no-daemon | grep 'Version:' | cut -f2 -d' ' > .version
13+
${gradlecmd} printVersion --max-workers=1 --no-build-cache --stacktrace --info --no-watch-fs --no-daemon | grep 'Version:' | cut -f2 -d' ' > .version
1414
local version=$(cat .version)
1515
if [ -z "$version" ]; then
1616
echo "ERROR: Failed to determine version from Gradle printVersion task" >&2

build-logic/conventions/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
}
44

55
repositories {
6-
val proxy = gradle.startParameter.projectProperties["mavenRepositoryProxy"]
7-
?: System.getenv("ORG_GRADLE_PROJECT_mavenRepositoryProxy")
8-
if (proxy != null) {
9-
maven { url = uri(proxy) }
10-
}
116
gradlePluginPortal()
127
mavenCentral()
138
}

build-logic/settings.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
pluginManagement {
2-
def proxy = gradle.startParameter.projectProperties['mavenRepositoryProxy']
3-
?: System.getenv('ORG_GRADLE_PROJECT_mavenRepositoryProxy')
4-
repositories {
5-
if (proxy) {
6-
maven { url proxy }
7-
}
8-
gradlePluginPortal()
9-
mavenCentral()
10-
}
11-
}
12-
131
rootProject.name = 'build-logic'
142

153
include 'conventions'

build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ buildscript {
55
classpath("com.dipien:semantic-version-gradle-plugin:2.0.0")
66
}
77
repositories {
8-
val proxy = gradle.startParameter.projectProperties["mavenRepositoryProxy"]
9-
?: System.getenv("ORG_GRADLE_PROJECT_mavenRepositoryProxy")
10-
if (proxy != null) {
11-
maven { url = uri(proxy) }
12-
}
138
mavenLocal()
149
mavenCentral()
1510
gradlePluginPortal()

settings.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
pluginManagement {
22
includeBuild("build-logic")
3-
val gradlePluginProxy = providers.gradleProperty("gradlePluginProxy").orNull
43
repositories {
5-
if (gradlePluginProxy != null) {
6-
maven { url = uri(gradlePluginProxy) }
7-
}
84
gradlePluginPortal()
95
mavenCentral()
106
}

0 commit comments

Comments
 (0)