Pedroro/release/4.8.6 (#1779)

p3dr0rv · fadidurah · web-flow · commit 861e7e7485cb · 2024-02-12T15:00:00.000-08:00
* update changelog. common, build.gradle and version.properties

* fix rc1

* update common

* update to rc2

* update common

* update changelog

* rc3

* update to rc5

* remove rc

* update adal test app

---------

Co-authored-by: fadidurah &lt;fadidurah@microsoft.com&gt;
diff --git a/adal/build.gradle b/adal/build.gradle
@@ -132,7 +132,7 @@ android {
 }
 
 // In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
-String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "1.0.+"
+String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "17.1.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.8.5
+versionName=4.8.6
 versionCode=1
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,10 @@
 Version Next
 -------------
 
+Version 4.8.6
+-------------
+- [PATCH] Update common @17.1.0
+
 Version 4.8.5
 -------------
 - [PATCH] Update common @17.0.1
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit f1d9f52e39b59ad82c8eba5896b4934d8721bbc0
+Subproject commit 385fddc29f05cdd943fe55531b9db9b7ea6ab90a
diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle
@@ -16,8 +16,8 @@ allprojects {
     }
 }
 
-def adalVersion = "4.8.4"
-def commonVersion = "17.0.0"
+def adalVersion = "4.8.6"
+def commonVersion = "17.1.0"
 
 if (project.hasProperty("distAdalVersion")) {
     println "Overriding adal version to dist property " + distAdalVersion

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ android {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`// In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.`
`135`		`-String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "1.0.+"`
	`135`	`+String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "17.1.0"`
`136`	`136`
`137`	`137`	`dependencies {`
`138`	`138`	`coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion"`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ allprojects {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-def adalVersion = "4.8.4"`
`20`		`-def commonVersion = "17.0.0"`
	`19`	`+def adalVersion = "4.8.6"`
	`20`	`+def commonVersion = "17.1.0"`
`21`	`21`
`22`	`22`	`if (project.hasProperty("distAdalVersion")) {`
`23`	`23`	`println "Overriding adal version to dist property " + distAdalVersion`