Merging somalaya/release/4.7.1 to release/4.7.1 (#1736)

* updated versions.properties, build.gradle & changeLog * changed RC1 to RC3 as RC1 and RC2 are already pushed in Jul 2022 * updated common to RC2 * version changed to 4.7.0 * updated to RC3 * removed RC tags * updated changeLog, version.props and buildGradle
AzureAD · Jun 9, 2023 · e26168d · e26168d
1 parent 1edb259
commit e26168d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 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 : "13.0.1"
 
 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.6.0
+versionName=4.7.1
 versionCode=1
diff --git a/changelog.txt b/changelog.txt
@@ -1,8 +1,10 @@
-VNext
+Version 4.7.1
 -------------
 - [MAJOR] Consolidate Storage Supplier (breaking change introduced in common) #1729
 - [MINOR] Replacing SHA-1 used in broker validation with SHA-512 (#1732)
 - [MINOR] Removing thumbprint check from PkeyAuthChallenge (#1733)
+- [PATCH] Update common @13.0.1
+- [PATCH] Version 4.7.0 was built with common which had lint errors, updated to consume common after resolving errors
 
 Version 4.6.0
 -------------