Merge branch 'dev' into adjoh/rename-changelog

Author: AdamBJohnsonx

CHANGELOG

@@ -12,6 +12,7 @@ v.Next
 - [PATCH] Disregard pageload errors for the non-primary frame during interactive auth (#1603)
 - [PATCH] Updates Nimbus version 8.2 -> 9.9 (#1600)
 - [PATCH] Fix for ADAL cache replication to Msal/Common-Cache (#1616)
+- [PATCH] Updates to README File. 
 
 Version 3.1.3
 -------------

README.md

@@ -379,7 +379,7 @@ Federated sign-in may fail when attempting to authenticate using the Azure Activ
 
 ### Querying cache items
 
-ADAL provides Default cache in SharedPrefrecens with some simple cache query fucntions. You can get the current cache from AuthenticationContext with:
+ADAL provides Default cache in SharedPrefrences with some simple cache query methods. You can get the current cache from AuthenticationContext with:
 
 ```java
 ITokenCacheStore cache = mContext.getCache();

adal/build.gradle

@@ -131,6 +131,8 @@ android {
     useLibrary 'android.test.mock'
 }
 
+String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "0.0.+"
+
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion"
 
@@ -147,12 +149,11 @@ dependencies {
         transitive = true
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.4.5', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: commonVersion, changing: true)
 
     // 'dist' flavor dependencies
-    //TODO: we will have to change transitive to true once common4j is published
-    distApi("com.microsoft.identity:common:3.4.5") {
-        transitive = false
+    distApi("com.microsoft.identity:common:${commonVersion}") {
+        transitive = true
     }
 
     // Android Instrumented Test Dependencies
@@ -184,7 +185,7 @@ task sourcesJar(type: Jar) {
 task javadoc(type: Javadoc) {
     failOnError false
     source = android.sourceSets.main.java.srcDirs
-    classpath += configurations.api
+    classpath += configurations.compile
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     classpath += configurations.javadocDeps
     exclude '**/*.aidl'

adal/versioning/version_tasks.gradle

@@ -3,7 +3,7 @@ def getVersionFile() {
 }
 
 def getVersionProps() {
-    def versionProps = new Properties();
+    def versionProps = new Properties()
     getVersionFile().withInputStream {stream -> versionProps.load(stream)}
     return versionProps
 }
@@ -25,7 +25,7 @@ ext.getAppVersionCode = {
 }
 
 ext.getAppVersionName = {
-    getVersionProps()['versionName'].toString()
+    project.findProperty('projVersion') ?: getVersionProps()['versionName'].toString()
 }
 
 private void saveChanges(String versionName) {

azure-pipelines/vsts-releases/adal-vsts-release.yml

@@ -9,6 +9,14 @@ name: $(date:yyyyMMdd)$(rev:.r)
 trigger: none
 pr: none
 
+resources:
+  repositories:
+    - repository: common
+      type: github
+      name: AzureAD/microsoft-authentication-library-common-for-android
+      ref: dev
+      endpoint: ANDROID_GITHUB
+
 jobs:
 - job: build_publish
   displayName: Publish adal to internal feed
@@ -38,4 +46,21 @@ jobs:
     inputs:
       tasks: adal:publish
       publishJUnitResults: false
+  - template: azure-pipelines/templates/steps/generate-sbom.yml@common
+    parameters:
+      project: adal
+      buildDropPath: $(Build.SourcesDirectory)/adal/build/
+      configuration: distReleaseRuntimeClasspath
+  - task: CopyFiles@2
+    name: CopyFiles1
+    displayName: Copy Files to Artifact Staging Directory
+    inputs:
+      SourceFolder: adal\build\
+      TargetFolder: $(build.artifactstagingdirectory)
+  - task: PublishPipelineArtifact@1
+    name: PublishPipelineArtifact1
+    displayName: 'Publish Artifact: adal Release'
+    inputs:
+      ArtifactName: adalRelease
+      TargetPath: $(Build.ArtifactStagingDirectory)
 ...

build.gradle

@@ -32,6 +32,10 @@ allprojects {
     tasks.withType(Javadoc) {
         options.addStringOption('Xdoclint:none', '-quiet')
     }
+
+    dependencyLocking {
+        lockAllConfigurations()
+    }
 }
 
 

common

@@ -45,6 +45,7 @@ ext {
     robolectricVersion = "4.3.1"
     uiAutomatorVersion = "2.2.0"
     mseberaApacheHttpClientVersion = "4.5.8"
+    msal4jVersion = "1.10.0"
 
     // TODO: adal automation test app.
     supportLibraryVersion = "27.1.+"

gradle/versions.gradle

@@ -7,9 +7,12 @@ pluginManagement {
     }
 }
 
-include ':adal', ':userappwithbroker', ':common', 'keyvault', 'labapi', 'testutils', ':common4j'
+include ':adal', ':userappwithbroker', ':common', 'keyvault', 'labapi', 'testutils', ':common4j',
+        ':LabApiUtilities'
+
 project(':common').projectDir = new File('common/common')
 project(':keyvault').projectDir = new File('common/keyvault')
 project(':labapi').projectDir = new File('common/labapi')
 project(':testutils').projectDir = new File('common/testutils')
 project(':common4j').projectDir = new File('common/common4j')
+project(':LabApiUtilities').projectDir = new File('common/LabApiUtilities')