Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ buildscript {
*/

repositories {
// If you don't have access to the package feed below, uncomment the maven central repo
// mavenCentral()
mavenLocal()
google()
mavenCentral()
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"
// 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") : 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")
}
}
}
Expand All @@ -44,21 +46,19 @@ 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 {
mavenLocal()
google()
mavenCentral()
maven {
url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
}
// 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 AndroidADAL feed.
name "vsts-maven-adal-android"
url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
// 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 project.vstsUsername
password project.vstsMavenAccessToken
Expand Down
27 changes: 17 additions & 10 deletions java-complete/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
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")

repositories {
// If you don't have access to the package feed below, uncomment the maven central repo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why might someone not have access to this feed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They need an access token for identity division no? What if it's a third party customer? Might not be applicable for android-compelte or broker, but it would be for msal/common. i decided to add it everywhere to be consistent, in case some internal users don't have access to the feed but want to build.

// mavenCentral()
google()
mavenCentral()
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 project.vstsUsername
password project.vstsMavenAccessToken
}
}
}

dependencies {
Expand All @@ -15,16 +25,13 @@ buildscript {

allprojects {
repositories {
// If you don't have access to the package feed below, uncomment the maven central repo
// mavenCentral()
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"
name "vsts-maven-new-android"
url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
credentials {
username project.vstsUsername
password project.vstsMavenAccessToken
Expand Down
13 changes: 11 additions & 2 deletions java-complete/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,20 @@
*/
pluginManagement {
repositories {
// If you don't have access to the package feed below, uncomment the maven central repo
// mavenCentral()
mavenLocal()
google()
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_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
}
}
}
}

Expand Down Expand Up @@ -44,4 +54,3 @@ project(':java-linux-test-app').projectDir = new File('../broker/java-linux-test

include(':LabApiUtilities')
project(':LabApiUtilities').projectDir = new File('../common/LabApiUtilities')

8 changes: 8 additions & 0 deletions plugins/buildsystem/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 7 additions & 6 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ pluginManagement {
repositories {
mavenLocal()
google()
mavenCentral()
// If you don't have access to the package feed below, uncomment the maven central repo
// mavenCentral()
gradlePluginPortal()
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"
// 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
}
}
}
Expand Down