From cf9d7fad9117755cb460a3c03333917d66e5adf7 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Wed, 3 Dec 2025 16:11:57 -0500 Subject: [PATCH 01/11] maven central --- build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index 10fa8b7a..4734c10b 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,6 @@ buildscript { repositories { google() - mavenCentral() maven { // msazure and aria are consumed via upstream sources of the AndroidADAL feed. name "vsts-maven-adal-android" @@ -51,10 +50,6 @@ allprojects { repositories { mavenLocal() google() - mavenCentral() - maven { - url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1' - } maven { // msazure and aria are consumed via upstream sources of the AndroidADAL feed. name "vsts-maven-adal-android" From e350300177ce866b80522ce09edf28b85af051a0 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Thu, 4 Dec 2025 19:23:18 -0500 Subject: [PATCH 02/11] new feed --- build.gradle | 14 +++++++++----- java-complete/build.gradle | 19 ++++++++++--------- settings.gradle | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 4734c10b..d14328ed 100644 --- a/build.gradle +++ b/build.gradle @@ -14,11 +14,13 @@ buildscript { */ repositories { - google() +// google() +// mavenCentral() + mavenLocal() maven { // msazure and aria are consumed via upstream sources of the AndroidADAL feed. name "vsts-maven-adal-android" - url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") @@ -49,11 +51,13 @@ project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS allprojects { repositories { mavenLocal() - google() + // If you don't have access to the package feed uncomment these repositories +// google() +// mavenCentral() maven { - // msazure and aria are consumed via upstream sources of the AndroidADAL feed. + // msazure and aria are consumed via upstream sources of the NewAndroid feed. name "vsts-maven-adal-android" - url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username project.vstsUsername password project.vstsMavenAccessToken diff --git a/java-complete/build.gradle b/java-complete/build.gradle index ca40412c..1adda766 100644 --- a/java-complete/build.gradle +++ b/java-complete/build.gradle @@ -4,8 +4,15 @@ buildscript { apply from: rootProject.file("../gradle/versions.gradle") repositories { - google() - mavenCentral() + maven { + // msazure and aria are consumed via upstream sources of the NewAndroid feed. + name "vsts-maven-adal-android" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" + credentials { + username project.vstsUsername + password project.vstsMavenAccessToken + } + } } dependencies { @@ -16,15 +23,9 @@ buildscript { allprojects { repositories { mavenLocal() - google() - mavenCentral() - maven { - url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1' - } maven { - // msazure and aria are consumed via upstream sources of the AndroidADAL feed. name "vsts-maven-adal-android" - url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username project.vstsUsername password project.vstsMavenAccessToken diff --git a/settings.gradle b/settings.gradle index c91d8833..fc7c52cc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,9 +13,9 @@ pluginManagement { mavenCentral() gradlePluginPortal() maven { - // msazure and aria are consumed via upstream sources of the AndroidADAL feed. + // msazure and aria are consumed via upstream sources of the NewAndroid feed. name "vsts-maven-adal-android" - url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : vstsUsername password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : vstsMavenAccessToken From 8cffaa915682ccdb563de7159f18200fb5d6d43a Mon Sep 17 00:00:00 2001 From: fadidurah Date: Fri, 5 Dec 2025 18:32:06 -0500 Subject: [PATCH 03/11] update --- build.gradle | 6 ++---- gradle/versions.gradle | 2 +- settings.gradle | 7 ++++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index d14328ed..5785d89c 100644 --- a/build.gradle +++ b/build.gradle @@ -14,12 +14,10 @@ buildscript { */ repositories { -// google() -// mavenCentral() mavenLocal() maven { // msazure and aria are consumed via upstream sources of the AndroidADAL feed. - name "vsts-maven-adal-android" + name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") @@ -56,7 +54,7 @@ allprojects { // mavenCentral() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. - name "vsts-maven-adal-android" + name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username project.vstsUsername diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 2112f397..e44e6100 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -73,7 +73,7 @@ ext { mockitoKotlinVersion = "4.1.0" androidxAnnotationVersion = "1.4.0" spotBugsAnnotationVersion = "4.3.0" - jcipAnnotationVersion = "1.0-1" + jcipAnnotationVersion = "1.0.+" openTelemetryVersion = "1.18.0" jetpackDataStoreVersion = "1.0.0" blockstoreVersion="16.2.0" diff --git a/settings.gradle b/settings.gradle index fc7c52cc..4acc7749 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,12 +9,13 @@ pluginManagement { repositories { mavenLocal() - google() - mavenCentral() + // If you don't have access to the package feed below, uncomment these repositories +// google() +// mavenCentral() gradlePluginPortal() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. - name "vsts-maven-adal-android" + name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : vstsUsername From 0a9b84c8c71592a0449ce902c4dd09f92b6380ab Mon Sep 17 00:00:00 2001 From: fadidurah Date: Fri, 5 Dec 2025 18:36:58 -0500 Subject: [PATCH 04/11] revert version --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index e44e6100..2112f397 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -73,7 +73,7 @@ ext { mockitoKotlinVersion = "4.1.0" androidxAnnotationVersion = "1.4.0" spotBugsAnnotationVersion = "4.3.0" - jcipAnnotationVersion = "1.0.+" + jcipAnnotationVersion = "1.0-1" openTelemetryVersion = "1.18.0" jetpackDataStoreVersion = "1.0.0" blockstoreVersion="16.2.0" From 549ce644de30f87fe00cd8b3e3edad87a8a8cfb7 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Fri, 5 Dec 2025 18:41:26 -0500 Subject: [PATCH 05/11] comments --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5785d89c..ad0cdfe1 100644 --- a/build.gradle +++ b/build.gradle @@ -50,8 +50,8 @@ allprojects { repositories { mavenLocal() // If you don't have access to the package feed uncomment these repositories -// google() -// mavenCentral() + // google() + // mavenCentral() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. name "vsts-maven-new-android" From 1325d99a75fca4588553a05d7c48b2d2af62c522 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Fri, 5 Dec 2025 19:57:43 -0500 Subject: [PATCH 06/11] update --- build.gradle | 8 +++++--- settings.gradle | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ad0cdfe1..06af7ad3 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { repositories { mavenLocal() maven { - // msazure and aria are consumed via upstream sources of the AndroidADAL feed. + // msazure and aria are consumed via upstream sources of the NewAndroid feed. name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { @@ -45,12 +45,14 @@ plugins { project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") +// Also declare password, so libraries have access to it +project.ext.vstsPassword = project.vstsMavenAccessToken allprojects { repositories { mavenLocal() - // If you don't have access to the package feed uncomment these repositories - // google() + google() + // If you don't have access to the package feed uncomment the maven central repo // mavenCentral() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. diff --git a/settings.gradle b/settings.gradle index 4acc7749..51fb6b36 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,8 +9,8 @@ pluginManagement { repositories { mavenLocal() - // If you don't have access to the package feed below, uncomment these repositories -// google() + google() + // If you don't have access to the package feed below, uncomment the maven central repo // mavenCentral() gradlePluginPortal() maven { From efd561fdbed098ed9a6539110b9f6a2ca1a15156 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Fri, 5 Dec 2025 22:09:01 -0500 Subject: [PATCH 07/11] keep google() --- build.gradle | 1 + java-complete/build.gradle | 6 ++++-- java-complete/settings.gradle | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 06af7ad3..d8fc7f64 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ buildscript { repositories { mavenLocal() + google() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. name "vsts-maven-new-android" diff --git a/java-complete/build.gradle b/java-complete/build.gradle index 1adda766..d52c6fd8 100644 --- a/java-complete/build.gradle +++ b/java-complete/build.gradle @@ -4,9 +4,10 @@ buildscript { apply from: rootProject.file("../gradle/versions.gradle") repositories { + google() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. - name "vsts-maven-adal-android" + name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username project.vstsUsername @@ -23,8 +24,9 @@ buildscript { allprojects { repositories { mavenLocal() + google() maven { - name "vsts-maven-adal-android" + name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { username project.vstsUsername diff --git a/java-complete/settings.gradle b/java-complete/settings.gradle index b06f4354..73787f58 100644 --- a/java-complete/settings.gradle +++ b/java-complete/settings.gradle @@ -10,7 +10,6 @@ pluginManagement { repositories { mavenLocal() google() - mavenCentral() gradlePluginPortal() } } From e2229ed7794000b7acf90e8c42447a7a61fd1bb7 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Fri, 5 Dec 2025 22:11:07 -0500 Subject: [PATCH 08/11] add feed --- java-complete/settings.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/java-complete/settings.gradle b/java-complete/settings.gradle index 73787f58..8a68ecda 100644 --- a/java-complete/settings.gradle +++ b/java-complete/settings.gradle @@ -11,6 +11,15 @@ pluginManagement { mavenLocal() google() gradlePluginPortal() + maven { + // msazure and aria are consumed via upstream sources of the NewAndroid feed. + name "vsts-maven-new-android" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" + credentials { + username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : vstsUsername + password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : vstsMavenAccessToken + } + } } } From 149eb7d39f68eff885da7048e0896a55de395346 Mon Sep 17 00:00:00 2001 From: fadidurah Date: Mon, 8 Dec 2025 15:21:12 -0500 Subject: [PATCH 09/11] vstsMavenAccessToken --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index d8fc7f64..3d92aac4 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,6 @@ plugins { project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") -// Also declare password, so libraries have access to it -project.ext.vstsPassword = project.vstsMavenAccessToken allprojects { repositories { From 80f80aabcdaa1522b7e1270e9f12fe7ef659b6ad Mon Sep 17 00:00:00 2001 From: fadidurah Date: Mon, 8 Dec 2025 20:00:28 -0500 Subject: [PATCH 10/11] consolidate vsts variables --- build.gradle | 10 ++++++---- java-complete/build.gradle | 4 ++-- java-complete/settings.gradle | 5 ++--- plugins/buildsystem/build.gradle | 8 ++++++++ settings.gradle | 6 +++--- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 3d92aac4..2a0fa405 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,8 @@ buildscript { */ repositories { + // If you don't have access to the package feed below, uncomment the maven central repo + // mavenCentral() mavenLocal() google() maven { @@ -21,8 +23,8 @@ buildscript { name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { - username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") - password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") + username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername") + password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") } } } @@ -44,8 +46,8 @@ plugins { id "com.microsoft.hydralab.client-util" version "1.1.14" } -project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") -project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") +project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername") +project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") allprojects { repositories { diff --git a/java-complete/build.gradle b/java-complete/build.gradle index d52c6fd8..69cf2db2 100644 --- a/java-complete/build.gradle +++ b/java-complete/build.gradle @@ -1,5 +1,5 @@ -project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername") -project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") +project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername") +project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") buildscript { apply from: rootProject.file("../gradle/versions.gradle") diff --git a/java-complete/settings.gradle b/java-complete/settings.gradle index 8a68ecda..cb4e575b 100644 --- a/java-complete/settings.gradle +++ b/java-complete/settings.gradle @@ -16,8 +16,8 @@ pluginManagement { name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { - username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : vstsUsername - password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : vstsMavenAccessToken + username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : vstsUsername + password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : vstsMavenAccessToken } } } @@ -52,4 +52,3 @@ project(':java-linux-test-app').projectDir = new File('../broker/java-linux-test include(':LabApiUtilities') project(':LabApiUtilities').projectDir = new File('../common/LabApiUtilities') - diff --git a/plugins/buildsystem/build.gradle b/plugins/buildsystem/build.gradle index fe64581f..8ed9d8ab 100644 --- a/plugins/buildsystem/build.gradle +++ b/plugins/buildsystem/build.gradle @@ -41,6 +41,14 @@ repositories { mavenCentral() google() gradlePluginPortal() + maven { + name "vsts-maven-new-android" + url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" + credentials { + username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername") + password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") + } + } } dependencies { diff --git a/settings.gradle b/settings.gradle index 51fb6b36..86566439 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,15 +11,15 @@ pluginManagement { mavenLocal() google() // If you don't have access to the package feed below, uncomment the maven central repo -// mavenCentral() + // mavenCentral() gradlePluginPortal() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. name "vsts-maven-new-android" url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1" credentials { - username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : vstsUsername - password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : vstsMavenAccessToken + username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : vstsUsername + password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : vstsMavenAccessToken } } } From 482eca562e9a9fee4c79321165a7e47d323a57cb Mon Sep 17 00:00:00 2001 From: fadidurah Date: Tue, 9 Dec 2025 03:24:37 -0500 Subject: [PATCH 11/11] final parts --- java-complete/build.gradle | 4 ++++ java-complete/settings.gradle | 2 ++ 2 files changed, 6 insertions(+) diff --git a/java-complete/build.gradle b/java-complete/build.gradle index 69cf2db2..db67539e 100644 --- a/java-complete/build.gradle +++ b/java-complete/build.gradle @@ -4,6 +4,8 @@ buildscript { apply from: rootProject.file("../gradle/versions.gradle") repositories { + // If you don't have access to the package feed below, uncomment the maven central repo + // mavenCentral() google() maven { // msazure and aria are consumed via upstream sources of the NewAndroid feed. @@ -23,6 +25,8 @@ buildscript { allprojects { repositories { + // If you don't have access to the package feed below, uncomment the maven central repo + // mavenCentral() mavenLocal() google() maven { diff --git a/java-complete/settings.gradle b/java-complete/settings.gradle index cb4e575b..603fdf6d 100644 --- a/java-complete/settings.gradle +++ b/java-complete/settings.gradle @@ -8,6 +8,8 @@ */ pluginManagement { repositories { + // If you don't have access to the package feed below, uncomment the maven central repo + // mavenCentral() mavenLocal() google() gradlePluginPortal()