diff --git a/changelog b/changelog index aab2ce2180..685ecc9628 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- + +Version 5.10.0 +---------- +- [PATCH] Update common @20.0.0 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index 943fc16252..8fc0123bd8 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 943fc162520b6c39b97cc59fb44e7f7038429f3e +Subproject commit 8fc0123bd85130b0dc38c8b0d339b5ad5a88f792 diff --git a/msal/build.gradle b/msal/build.gradle index 08683e128b..4a3f2ab96b 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,12 +188,12 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "1.0.+" +def commonVersion = "20.0.0" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "1.0.+" +def common4jVersion = "17.0.0" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } @@ -309,16 +309,16 @@ afterEvaluate { // Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above) // Adding this work around to have the file properly renamed. // Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL. -// tasks.named("assembleDistRelease").configure { -// def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar") -// print "Build file $buildFile" -// doLast { -// println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'" -// if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) { -// println "Rename failed!" -// } -// } -// } + tasks.named("assembleDistRelease").configure { + def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar") + print "Build file $buildFile" + doLast { + println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'" + if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) { + println "Rename failed!" + } + } + } publishing { publications { msal(MavenPublication) { diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 7a63bade7d..2fddaa0764 100644 --- a/msal/versioning/version.properties +++ b/msal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=5.9.0 +versionName=5.10.0 versionCode=0