diff --git a/app/build.gradle b/app/build.gradle index bfa8076..679536d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,25 +6,6 @@ if (project.hasProperty("distMsalVersion")) { msalVersion = distMsalVersion } -allprojects { - repositories { - mavenCentral() - google() - mavenLocal() - maven { - url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1' - } - maven { - name "vsts-maven-adal-android" - url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1" - credentials { - username System.getenv("ENV_VSTS_MVN_ANDROIDADAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADAL_USERNAME") : project.findProperty("vstsUsername") - password System.getenv("ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken") - } - } - } -} - android { compileSdk rootProject.ext.compileSdkVersion defaultConfig { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a959e2d..485cf92 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,26 +23,7 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/raw/auth_config_multiple_account.json b/app/src/main/res/raw/auth_config_multiple_account.json index 14bdee6..165c8aa 100644 --- a/app/src/main/res/raw/auth_config_multiple_account.json +++ b/app/src/main/res/raw/auth_config_multiple_account.json @@ -1,6 +1,6 @@ { "client_id" : "0984a7b6-bc13-4141-8b0d-8f767e136bb7", - "authorization_user_agent" : "DEFAULT", + "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.azuresamples.msalandroidapp/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "account_mode" : "MULTIPLE", "broker_redirect_uri_registered": true, diff --git a/app/src/main/res/raw/auth_config_single_account.json b/app/src/main/res/raw/auth_config_single_account.json index acb68d9..6e66f98 100644 --- a/app/src/main/res/raw/auth_config_single_account.json +++ b/app/src/main/res/raw/auth_config_single_account.json @@ -1,6 +1,6 @@ { "client_id" : "0984a7b6-bc13-4141-8b0d-8f767e136bb7", - "authorization_user_agent" : "DEFAULT", + "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.azuresamples.msalandroidapp/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "account_mode" : "SINGLE", "broker_redirect_uri_registered": true, diff --git a/build.gradle b/build.gradle index bb81e71..d203a0e 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,6 @@ buildscript { } } -allprojects { - repositories { - google() - } -} task clean(type: Delete) { delete rootProject.buildDir diff --git a/settings.gradle b/settings.gradle index e7b4def..03e2e24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,20 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { + url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1' + } + } +} + +rootProject.name = "ms-identity-android-java" include ':app'