Skip to content

Commit 61a19e6

Browse files
fix: add CFS upstream feed to build.gradle and settings.gradle
Adds the GraphDeveloperExperiences_Public Azure Artifacts feed (with Maven Central upstream) to both repositories and publishing.repositories in build.gradle, and to pluginManagement in settings.gradle. Removes the init.gradle pipeline workaround in favor of direct configuration. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent c31d3f4 commit 61a19e6

3 files changed

Lines changed: 25 additions & 24 deletions

File tree

‎.azure-pipelines/daily-ci-build.yml‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,36 +43,13 @@ extends:
4343
- checkout: self
4444
submodules: recursive
4545

46-
- script: |
47-
cat > init.gradle << 'EOF'
48-
allprojects {
49-
repositories {
50-
clear()
51-
maven {
52-
url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
53-
}
54-
}
55-
}
56-
settingsEvaluated { settings ->
57-
settings.pluginManagement {
58-
repositories {
59-
clear()
60-
maven {
61-
url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
62-
}
63-
}
64-
}
65-
}
66-
EOF
67-
displayName: Configure Gradle to use CFS upstream feed
68-
6946
- task: Gradle@4
7047
displayName: Build and Test SDK
7148
inputs:
7249
gradleWrapperFile: 'gradlew'
7350
workingDirectory: '$(Build.SourcesDirectory)'
7451
tasks: 'assemble test'
75-
options: '--no-daemon --init-script init.gradle'
52+
options: '--no-daemon'
7653
publishJUnitResults: true
7754
testResultsFiles: '**/TEST-*.xml'
7855
javaHomeOption: 'JDKVersion'

‎build.gradle‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ sourceSets {
6969
repositories {
7070
// You can declare any Maven/Ivy/file repository here.
7171
mavenCentral()
72+
maven {
73+
url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
74+
name 'GraphDeveloperExperiences_Public'
75+
credentials(PasswordCredentials)
76+
authentication {
77+
basic(BasicAuthentication)
78+
}
79+
}
7280
}
7381

7482
apply from: "gradle/dependencies.gradle"
@@ -119,6 +127,14 @@ publishing {
119127
name = "ADO"
120128
url = layout.buildDirectory.dir("publishing-repository")
121129
}
130+
maven {
131+
url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
132+
name 'GraphDeveloperExperiences_Public'
133+
credentials(PasswordCredentials)
134+
authentication {
135+
basic(BasicAuthentication)
136+
}
137+
}
122138
}
123139
}
124140

‎settings.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ pluginManagement {
22
repositories {
33
gradlePluginPortal()
44
mavenCentral()
5+
maven {
6+
url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
7+
name 'GraphDeveloperExperiences_Public'
8+
credentials(PasswordCredentials)
9+
authentication {
10+
basic(BasicAuthentication)
11+
}
12+
}
513
}
614
}
715

0 commit comments

Comments
 (0)