Skip to content

Merge alias branch to release branch #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
p3dr0rv merged 7 commits into from
Feb 10, 2025
+18 −14
Merged

Merge alias branch to release branch #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c00de3
update RC
p3dr0rv Feb 3, 2025
024840a
update to RC2
p3dr0rv Feb 4, 2025
fc2a5fc
rc3
p3dr0rv Feb 5, 2025
4abf7e1
RC4
p3dr0rv Feb 8, 2025
67f1f41
rc5
p3dr0rv Feb 9, 2025
aeec0e2
remove rc
p3dr0rv Feb 10, 2025
b577819
maven changes
p3dr0rv Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 22 files
+12 −0 changelog.txt
+1 −1 common/build.gradle
+92 −17 common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java
+24 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/PackageHelper.java
+0 −34 common/src/main/java/com/microsoft/identity/common/internal/msafederation/IMsaFederatedCredentialCallback.kt
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederatedSignInProviderFactory.kt
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederationConstants.kt
+7 −9 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/GoogleSignInProvider.kt
+0 −34 ...ain/java/com/microsoft/identity/common/internal/msafederation/google/ISignInWithGoogleCredentialCallback.kt
+14 −7 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleApi.kt
+13 −3 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleParameters.kt
+1 −28 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/AndroidBrowserSelector.java
+8 −9 common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/GoogleSignInProviderTest.kt
+4 −2 common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/MockGoogleSignInProvider.kt
+36 −23 common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleApiTest.kt
+12 −1 ...src/test/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleParametersTest.kt
+2 −1 common/src/test/java/com/microsoft/identity/common/internal/ui/browser/AndroidBrowserSelectorTest.java
+6 −1 common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
+16 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+2 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
+1 −1 common4j/versioning/version.properties
+1 −1 versioning/version.properties
24 changes: 12 additions & 12 deletions msal/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion msal/versioning/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Wed Aug 01 15:24:11 PDT 2018
versionName=5.9.0
versionName=5.10.0
versionCode=0
Loading