Skip to content
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

Jump to bottom

Update Nimbus Version 8.2 -> 9.9 #1600

Merged
merged 8 commits into from
May 11, 2021
Merged

Update Nimbus Version 8.2 -> 9.9 #1600

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3a9922c
Update submodule to latest
iambmelt May 3, 2021
e50e947
Update Nimbus version 8.2 -> 9.9
iambmelt May 3, 2021
1995f5d
Update changelog
iambmelt May 3, 2021
dcc240e
Submodule update + additional test updates
iambmelt May 3, 2021
265182e
Update submodule to latest
iambmelt May 11, 2021
456d7f0
Merge branch 'dev' into iambmelt/update-nimbus-5-3-21
iambmelt May 11, 2021
70203b1
Revert changes to file
iambmelt May 11, 2021
52beecb
Revert change to file
iambmelt May 11, 2021
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
2 changes: 1 addition & 1 deletion adal/src/androidTest/java/com/microsoft/aad/adal/BrokerProxyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void setUp() throws Exception {
.getPackageInfo(
androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()
.getContext().getPackageName(),
PackageHelper.getPackageManagerFlag()
iambmelt marked this conversation as resolved.
Show resolved Hide resolved
PackageHelper.getPackageManagerSignaturesFlag()
);

// Broker App can be signed with multiple certificates. It will look
Expand Down
2 changes: 1 addition & 1 deletion adal/src/androidTest/java/com/microsoft/aad/adal/PackageHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ private PackageManager getPackageManager(final Signature signature,
when(
mockPackage.getPackageInfo(
packageName,
PackageHelper.getPackageManagerFlag()
iambmelt marked this conversation as resolved.
Show resolved Hide resolved
PackageHelper.getPackageManagerSignaturesFlag()
)
).thenReturn(info);

Expand Down
2 changes: 1 addition & 1 deletion changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ v.Next
- [PATCH] Fixes deprecated PackageInfo.signatures (#1587)
- [PATCH] Deprecated ADAL namespaced AuthenticationSettings#setSecretKey(), #getSecretKey() (#1586)
- [PATCH] Disregard pageload errors for the non-primary frame during interactive auth (#1603)
- Picks up [email protected]
iambmelt marked this conversation as resolved.
Show resolved Hide resolved
- [PATCH] Updates Nimbus version 8.2 -> 9.9 (#1600)

Version 3.1.2
-------------
Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 293 files
2 changes: 1 addition & 1 deletion gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ext {
mockitoCoreVersion = "3.6.28"
mockitoAndroidVersion = "3.6.28"
multidexVersion = "2.0.1"
nimbusVersion = "8.2"
nimbusVersion = "9.9"
powerMockVersion = "1.6.6"
runnerVersion = "1.2.0"
rulesVersion = "1.2.0"
Expand Down