diff --git a/adal/build.gradle b/adal/build.gradle index 6e71f7f08..b97f3132b 100644 --- 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 index ec083c84b..b7c7b8821 100644 --- 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 index c94c4d5b8..713e2f1a2 100644 --- 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 index f1d9f52e3..385fddc29 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f1d9f52e39b59ad82c8eba5896b4934d8721bbc0 +Subproject commit 385fddc29f05cdd943fe55531b9db9b7ea6ab90a diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle index eb4da5759..56257d845 100644 --- 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