Skip to content

Commit 585cdc0

Browse files
authored
Merge alias branch to release branch (#2255)
1 parent 213efa4 commit 585cdc0

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
22

33
vNext
44
----------
5+
6+
Version 5.10.0
7+
----------
8+
- [PATCH] Update common @20.0.0
59
- [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247)
610
- [MINOR] Move native auth public methods to parameter class (#2245)
711
- [MINOR] Add support for claims requests for native auth sign in (#2246)

common

Submodule common updated 22 files

msal/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ task sourcesJar(type: Jar) {
188188

189189
// In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
190190
// In release/*, we change these to specific versions being consumed.
191-
def commonVersion = "1.0.+"
191+
def commonVersion = "20.0.0"
192192
if (project.hasProperty("distCommonVersion")) {
193193
commonVersion = project.distCommonVersion
194194
}
195195
// Used for testfixtures
196-
def common4jVersion = "1.0.+"
196+
def common4jVersion = "17.0.0"
197197
if (project.hasProperty("distCommon4jVersion")) {
198198
distCommon4jVersion = project.distCommon4jVersion
199199
}
@@ -309,16 +309,16 @@ afterEvaluate {
309309
// Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above)
310310
// Adding this work around to have the file properly renamed.
311311
// Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL.
312-
// tasks.named("assembleDistRelease").configure {
313-
// def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
314-
// print "Build file $buildFile"
315-
// doLast {
316-
// println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
317-
// if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
318-
// println "Rename failed!"
319-
// }
320-
// }
321-
// }
312+
tasks.named("assembleDistRelease").configure {
313+
def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
314+
print "Build file $buildFile"
315+
doLast {
316+
println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
317+
if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
318+
println "Rename failed!"
319+
}
320+
}
321+
}
322322
publishing {
323323
publications {
324324
msal(MavenPublication) {

msal/versioning/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Wed Aug 01 15:24:11 PDT 2018
2-
versionName=5.9.0
2+
versionName=5.10.0
33
versionCode=0

0 commit comments

Comments
 (0)