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

Merging Release/4.8.18 to dev #1817

Merged
merged 5 commits into from
Nov 27, 2024
Merged

Merging Release/4.8.18 to dev #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c27f020
Merge amgusain/release/4.8.16 to release/4.8.16 (#1813)
iamgusain Nov 12, 2024
ccd46a2
Merge Amgusain/release/4.8.17 to release/4.8.17 (#1815)
iamgusain Nov 15, 2024
ed28d93
Update version.properties, build.gradle with RC1
somalaya Nov 18, 2024
4c21980
Removed RC1 tags
somalaya Nov 18, 2024
ee6a8ff
merging back to dev
somalaya Nov 20, 2024
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/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=4.8.16
versionName=4.8.18
somalaya marked this conversation as resolved.
Show resolved Hide resolved
versionCode=1
7 changes: 6 additions & 1 deletion changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
vNext
Version 4.8.18
---------
- [PATCH] Update common @18.2.2

Version 4.8.17
---------
- [PATCH] Update common @18.2.1

Version 4.8.16
---------
Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 9 files
+10 −0 changelog.txt
+1 −1 common/build.gradle
+1 −1 common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java
+21 −3 common/src/main/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtil.java
+22 −48 common4j/src/main/com/microsoft/identity/common/java/controllers/ExceptionAdapter.java
+11 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+37 −0 common4j/src/test/com/microsoft/identity/common/java/controllers/ExceptionAdapterTests.java
+1 −1 common4j/versioning/version.properties
+1 −1 versioning/version.properties
4 changes: 2 additions & 2 deletions userappwithbroker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ allprojects {
}
}

def adalVersion = "4.8.16"
def commonVersion = "18.2.0"
def adalVersion = "4.8.18"
def commonVersion = "18.2.2"

if (project.hasProperty("distAdalVersion")) {
println "Overriding adal version to dist property " + distAdalVersion
Expand Down