Skip to content

Commit f7ddb6e

Browse files
authored
Changes for August 2024 release setup (#2152)
1 parent ce7c223 commit f7ddb6e

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

changelog

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
33
vNext
44
----------
55

6+
Version 5.5.0
7+
---------
8+
- [MINOR] Fix UserAttributesBuilder being a singleton bug (#2145)
9+
- [PATCH] Update common @17.7.0
10+
611
Version 5.4.2
712
---------
813
- [PATCH] Update common @17.6.1
9-
- [MINOR] Fix UserAttributesBuilder being a singleton bug (#2145)
1014

1115
Version 5.4.0
1216
----------

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 = "17.7.0"
192192
if (project.hasProperty("distCommonVersion")) {
193193
commonVersion = project.distCommonVersion
194194
}
195195
// Used for testfixtures
196-
def common4jVersion = "1.0.+"
196+
def common4jVersion = "14.7.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.4.2
2+
versionName=5.5.0
33
versionCode=0

msalautomationapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

4-
def msalVersion = "5.4.0"
4+
def msalVersion = "5.+"
55

66
if (project.hasProperty("distMsalVersion")) {
77
msalVersion = distMsalVersion

0 commit comments

Comments
 (0)