From c27f020f855c7ef54be3a288cf7e32f90d381800 Mon Sep 17 00:00:00 2001 From: iamgusain <75644120+iamgusain@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:09:02 -0500 Subject: [PATCH 1/5] Merge amgusain/release/4.8.16 to release/4.8.16 (#1813) * [Nov 2024 - Release] Update build.gradle, versions.properties, and changelog files with RC1 version * update common submodule * Remove RC1 tag * update version for test apps * update common submodule to release/18.2.0 --- adal/build.gradle | 2 +- changelog.txt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 9b990a2ee..69dbad77c 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. -def commonVersion = "1.0.+" +def commonVersion = "18.2.0" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } diff --git a/changelog.txt b/changelog.txt index 19ddb6028..4a7abcde3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,3 @@ -vNext ---------- - Version 4.8.16 --------- - [PATCH] Update common @18.2.0 From ccd46a2cb53cc045c3dc9e574e3c8b5e49a9c99a Mon Sep 17 00:00:00 2001 From: iamgusain <75644120+iamgusain@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:33:06 -0500 Subject: [PATCH 2/5] Merge Amgusain/release/4.8.17 to release/4.8.17 (#1815) * Update version.properties, build.gradle with RC1 * update common submodule * Remove RC1 tag * update common submodule to 18.2.1 --- adal/build.gradle | 2 +- adal/versioning/version.properties | 2 +- changelog.txt | 4 ++++ common | 2 +- userappwithbroker/build.gradle | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 69dbad77c..2b0a41f2b 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. -def commonVersion = "18.2.0" +def commonVersion = "18.2.1" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties index 8140928fd..dcd80bda6 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.16 +versionName=4.8.17 versionCode=1 diff --git a/changelog.txt b/changelog.txt index 4a7abcde3..f178bfa3e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +Version 4.8.17 +--------- +- [PATCH] Update common @18.2.1 + Version 4.8.16 --------- - [PATCH] Update common @18.2.0 diff --git a/common b/common index de57369dd..46b42c186 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit de57369dd6d1210fbe9ec38caaf2b694c623112c +Subproject commit 46b42c1869cea0a614a9be53e577182f1552d18c diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle index dfffb8eb9..42132775b 100644 --- a/userappwithbroker/build.gradle +++ b/userappwithbroker/build.gradle @@ -16,8 +16,8 @@ allprojects { } } -def adalVersion = "4.8.16" -def commonVersion = "18.2.0" +def adalVersion = "4.8.17" +def commonVersion = "18.2.1" if (project.hasProperty("distAdalVersion")) { println "Overriding adal version to dist property " + distAdalVersion From ed28d937132fb748db93657dfac85b830ec67961 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Mon, 18 Nov 2024 11:45:26 -0800 Subject: [PATCH 3/5] Update version.properties, build.gradle with RC1 --- adal/build.gradle | 2 +- adal/versioning/version.properties | 2 +- changelog.txt | 4 ++++ common | 2 +- userappwithbroker/build.gradle | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 2b0a41f2b..09a4d592f 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. -def commonVersion = "18.2.1" +def commonVersion = "18.2.2-RC1" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties index dcd80bda6..e6d1cf71e 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.17 +versionName=4.8.18-RC1 versionCode=1 diff --git a/changelog.txt b/changelog.txt index f178bfa3e..917f7f55b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +Version 4.8.18 +--------- +- [PATCH] Update common @18.2.2 + Version 4.8.17 --------- - [PATCH] Update common @18.2.1 diff --git a/common b/common index 46b42c186..b740fd848 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 46b42c1869cea0a614a9be53e577182f1552d18c +Subproject commit b740fd848a0e9749b1814b93d231b0644508379a diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle index 42132775b..d8bf5aebb 100644 --- a/userappwithbroker/build.gradle +++ b/userappwithbroker/build.gradle @@ -16,8 +16,8 @@ allprojects { } } -def adalVersion = "4.8.17" -def commonVersion = "18.2.1" +def adalVersion = "4.8.18-RC1" +def commonVersion = "18.2.2-RC1" if (project.hasProperty("distAdalVersion")) { println "Overriding adal version to dist property " + distAdalVersion From 4c2198037bf29984b30c8fd5670c7fffa32c8f4a Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Mon, 18 Nov 2024 15:59:53 -0800 Subject: [PATCH 4/5] Removed RC1 tags --- adal/build.gradle | 2 +- adal/versioning/version.properties | 2 +- common | 2 +- userappwithbroker/build.gradle | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 09a4d592f..535d6eac7 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. -def commonVersion = "18.2.2-RC1" +def commonVersion = "18.2.2" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties index e6d1cf71e..0fa4e7c8d 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.18-RC1 +versionName=4.8.18 versionCode=1 diff --git a/common b/common index b740fd848..97d294167 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b740fd848a0e9749b1814b93d231b0644508379a +Subproject commit 97d294167eb85252c23e85ac81f77efe3739bc54 diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle index d8bf5aebb..d316ebeca 100644 --- a/userappwithbroker/build.gradle +++ b/userappwithbroker/build.gradle @@ -16,8 +16,8 @@ allprojects { } } -def adalVersion = "4.8.18-RC1" -def commonVersion = "18.2.2-RC1" +def adalVersion = "4.8.18" +def commonVersion = "18.2.2" if (project.hasProperty("distAdalVersion")) { println "Overriding adal version to dist property " + distAdalVersion From ee6a8ff18e55c6c2b0376f26bf8317be63ae21a4 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Wed, 20 Nov 2024 13:26:04 -0800 Subject: [PATCH 5/5] merging back to dev --- adal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adal/build.gradle b/adal/build.gradle index 535d6eac7..9b990a2ee 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. -def commonVersion = "18.2.2" +def commonVersion = "1.0.+" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion }