Merging melissaahn/release/4.6.0 to release/4.6.0 (#1730)

* 4.6.0-RC1 * setting common submodule to melissaahn/release/12.0.0 * 4.6.0-RC2 * updating submodule * removing rc tags
AzureAD · May 9, 2023 · ab1684f · ab1684f
1 parent 237aabb
commit ab1684f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/adal/build.gradle b/adal/build.gradle
@@ -131,7 +131,7 @@ android {
     useLibrary 'android.test.mock'
 }
 
-String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "0.0.+"
+String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "12.0.0"
 
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion"

diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=4.5.0
+versionName=4.6.0
 versionCode=1
diff --git a/changelog.txt b/changelog.txt
@@ -1,7 +1,8 @@
-VNext
+Version 4.6.0
 -------------
 - [MINOR] Remove dependency from common's storagehelper #1725
 - [MINOR] Mapping ECDSA to EC in ClientCertRequest's keyTypes array (#1726)
+- [PATCH] Update common @12.0.0
 
 Version 4.5.0
 -------------

diff --git a/common b/common