ADAL Release 3.1.2 (#1569)

* Add release signing config for adal test app

* Closes #1073 - Explicitly Disables Content Provider Access to WebViews (#1541)

* AuthenticationActivity: disallow content access

* Minor cleanup to remove repeated getter calls

* Disable content access

* Removing repeated getter calls

* Run formatter

* Cleaning up formatting

* Removing impossible if condition. More cleanup

* Update adal/src/main/java/com/microsoft/aad/adal/AuthenticationDialog.java

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Disabling unreliable test -- unrelated to these changes

* Removing the entire broken test

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Closes #1354 (#1544)

* Post merge feedback update (#1545)

* Update submodule

* Set WebSettings#setAllowFileAccess(false) (#1542)

* AuthenticationActivity: disallow content access

* Minor cleanup to remove repeated getter calls

* Disable content access

* Removing repeated getter calls

* Run formatter

* Cleaning up formatting

* Removing impossible if condition. More cleanup

* Update adal/src/main/java/com/microsoft/aad/adal/AuthenticationDialog.java

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Disallow universal file access from file URLs

* Disallow file access

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Upgrade ADAL dependency to 3.1.0.

* Remove unused variable, fixing my local PMD build.

* Clear the MSAL cache replica is the ADAL cache is cleared (#1552)

* Update submodule to latest

* Organize imports

* Cleaning up javadoc

* Fix javadoc

* Add nullability annots

* Add line spacing for conditionals

* Wiring up wrapped cache

* Fixing nullability annots

* New unit test for cache clearing

* Removing test that no longer applies

* Removing test that was invalidated by improvements to doze mode when
active network connection is available

* Disabling unreliable tests

* Make primitives final

* Synchronize the wrapped cache

* Don't recompile patterns unneccesarily.

* Update submodule to latest (#1558)

* Merge master-to-dev post 3.1.1 deployment (#1559)

* Release/3.1.1  (#1556)

* Closes #1073 - Explicitly Disables Content Provider Access to WebViews (#1541)

* AuthenticationActivity: disallow content access

* Minor cleanup to remove repeated getter calls

* Disable content access

* Removing repeated getter calls

* Run formatter

* Cleaning up formatting

* Removing impossible if condition. More cleanup

* Update adal/src/main/java/com/microsoft/aad/adal/AuthenticationDialog.java

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Disabling unreliable test -- unrelated to these changes

* Removing the entire broken test

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Closes #1354 (#1544)

* Post merge feedback update (#1545)

* Update submodule

* Set WebSettings#setAllowFileAccess(false) (#1542)

* AuthenticationActivity: disallow content access

* Minor cleanup to remove repeated getter calls

* Disable content access

* Removing repeated getter calls

* Run formatter

* Cleaning up formatting

* Removing impossible if condition. More cleanup

* Update adal/src/main/java/com/microsoft/aad/adal/AuthenticationDialog.java

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Disallow universal file access from file URLs

* Disallow file access

Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>

* Upgrade ADAL dependency to 3.1.0.

* Remove unused variable, fixing my local PMD build.

* Clear the MSAL cache replica is the ADAL cache is cleared (#1552)

* Update submodule to latest

* Organize imports

* Cleaning up javadoc

* Fix javadoc

* Add nullability annots

* Add line spacing for conditionals

* Wiring up wrapped cache

* Fixing nullability annots

* New unit test for cache clearing

* Removing test that no longer applies

* Removing test that was invalidated by improvements to doze mode when
active network connection is available

* Disabling unreliable tests

* Make primitives final

* Synchronize the wrapped cache

* Don't recompile patterns unneccesarily.

* Bump to 3.1.1-RC1

* Update changelog for 3.1.1

* Point common to 2.1.1-RC1

* Update submodule

* Point common to 2.1.1-RC2

* Update version to 3.1.1-RC2

* Update submodule pointer to master

* Update deps to common@2.1.1

* Update readme for latest version

* Update version to 3.1.1 (remove RC)

Co-authored-by: Brian Melton-Grace <brianmel@microsoft.com>
Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>
Co-authored-by: Adam Johnson <adjoh@microsoft.com>

* Update submodule to common@dev(HEAD)

Co-authored-by: Shahzaib <37125644+shahzaibj@users.noreply.github.com>
Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>
Co-authored-by: Adam Johnson <adjoh@microsoft.com>

* Updated gradle to latest plugin and gradle versions

* Removed all references to findbugs

* Add changelog enforcement.

* Test changelog.

* Remove test changelog entry

* Update submodule dependency to release/3.0.6

* Update submodule to common@master (3.0.6 release)

* Update changelog

* Update readme version string

* Update version number for 3.1.2-RC1

* Update dependency to common@3.0.6

* Update changelog.txt

* Increase gradle version for manifest merger error

* Update to RC2 after tooling change

* Update to final version 3.1.2 for deployment

Co-authored-by: shahzaibj <shahzaib.jameel@microsoft.com>
Co-authored-by: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com>
Co-authored-by: Shahzaib <37125644+shahzaibj@users.noreply.github.com>
Co-authored-by: Adam Johnson <adjoh@microsoft.com>
Co-authored-by: Shane Oatman <shoatman@microsoft.com>

Author: 4 people

.github/workflows/pull-request.yml

@@ -0,0 +1,24 @@
+# This is a workflow to run the deploy snapshot pipeline in Azure DevOps
+name: pr_validation
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the dev branch
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
+    branches: [ dev ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # Make sure we have a changelog entry
+  changelog:
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dangoslen/changelog-enforcer@v1.4.0
+        with:
+          changeLogPath: 'changelog.txt'
+          skipLabel: 'No-Changelog'
+      

README.md

@@ -38,7 +38,7 @@ Note: A corpnet account is required to view the VSTS build.
 
 ## Versions
 
-Current version - 3.1.1
+Current version - 3.1.2
 
 Minimum recommended version - 1.16.3-hf1
 

adal/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'findbugs'
 apply plugin: 'pmd'
 apply plugin: 'checkstyle'
 apply plugin: 'maven-publish'
@@ -42,7 +41,6 @@ buildscript {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -118,13 +116,6 @@ android {
 }
 
 dependencies {
-    // Dependencies required only at compile time
-    compileOnly 'com.google.code.findbugs:annotations:3.0.1', {
-        // Need to exclude these, or build is broken by:
-        //   com.android.dex.DexException: Multiple dex files define Ljavax/annotation/CheckForNull
-        exclude module: 'jsr305'
-        exclude module: 'jcip-annotations'
-    }
 
     // Dependencies
     implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
@@ -139,10 +130,10 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.1.1', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.0.6', changing: true)
 
     // 'dist' flavor dependencies
-    distApi("com.microsoft.identity:common:2.1.1") {
+    distApi("com.microsoft.identity:common:3.0.6") {
         transitive = false
     }
 
@@ -298,29 +289,6 @@ artifacts {
     archives sourcesJar
 }
 
-findbugs {
-    ignoreFailures = false
-    reportsDir = file("$project.buildDir/outputs/")
-    reportLevel = "medium"
-    effort = "max"
-}
-
-task findbugs(type: FindBugs) {
-    description 'Run findbugs'
-    group 'verification'
-
-    classes = fileTree("$project.buildDir/intermediates/classes/local/debug/")
-    source = fileTree('src/main/java')
-    classpath = files()
-    effort = 'max'
-    excludeFilter = file("../config/findbugs/exclude.xml")
-
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
-}
-
 pmd {
     ignoreFailures = false
     reportsDir = file("$project.buildDir/outputs/")
@@ -361,7 +329,6 @@ task checkstyle(type: Checkstyle) {
 tasks.whenTaskAdded { task ->
     if (task.name == 'assembleDebug' || task.name == 'assembleRelease') {
         task.dependsOn 'checkstyle', 'pmd', 'lint'
-        task.finalizedBy 'findbugs'
     }
 }
 

adal/versioning/version.properties

@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=3.1.1
+versionName=3.1.2
 versionCode=1

changelog.txt

@@ -1,3 +1,9 @@
+Version 3.1.2
+-------------
+- Android changes for SDK30, see [the android developers notice](https://android-developers.googleblog.com/2020/07/preparing-your-build-for-package-visibility-in-android-11.html).
+- Updates common dependency to 3.0.6
+    * Provides Android 11 support fixes; see common@3.0.6 changelog for details.
+
 Version 3.1.1
 -------------
 - Fix ADAL/1073 - Explicitly disable Content Provider access from WebViews
@@ -364,4 +370,3 @@ Version 1.0.3
 Release Date: 10-3-2014
 * Dismiss spinner to resolve some UI issues
 * Use broker signature and authenticator type for checks. Get broker package from authenticator.
-

common

@@ -8,7 +8,7 @@ ext {
     buildToolsVersion = "28.0.3"
 
     // Plugins
-    gradleVersion = '3.3.1'
+    gradleVersion = '3.3.3'
     androidMavenGradlePluginVersion = "1.4.1"
 
     // Libraries

gradle/versions.gradle

@@ -18,7 +18,6 @@ allprojects {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.microsoft.aad.adal.userappwithbroker"
@@ -36,6 +35,16 @@ android {
                 keyPassword "android"
             }
         }
+
+        release {
+            def debugKeyFile = rootProject.file("gradle/debug.keystore")
+            if(debugKeyFile.exists()){
+                storeFile rootProject.file("gradle/debug.keystore")
+                storePassword "android"
+                keyAlias "androiddebugkey"
+                keyPassword "android"
+            }
+        }
     }
 
     flavorDimensions 'main'
@@ -54,6 +63,7 @@ android {
             buildConfigField("String", "REGULAR_REDIDRECT_URI", "\"msauth://com.microsoft.aad.adal.userappwithbroker/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D\"")
         }
         release {
+            signingConfig signingConfigs.release
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt')
             buildConfigField("String", "REGULAR_REDIDRECT_URI", "\"msauth://com.microsoft.aad.adal.userappwithbroker/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D\"")