merging into dev

AzureAD · Mar 7, 2025 · 89fac1b · 89fac1b
1 parent 56ac38b
commit 89fac1b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/common b/common
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -188,12 +188,12 @@ task sourcesJar(type: Jar) {
 
 // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
 // In release/*, we change these to specific versions being consumed.
-def commonVersion = "20.1.1"
+def commonVersion = "1.0.+"
 if (project.hasProperty("distCommonVersion")) {
     commonVersion = project.distCommonVersion
 }
 // Used for testfixtures
-def common4jVersion = "20.1.1"
+def common4jVersion = "1.0.+"
 if (project.hasProperty("distCommon4jVersion")) {
     distCommon4jVersion = project.distCommon4jVersion
 }
@@ -309,16 +309,16 @@ afterEvaluate {
     // Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above)
     // Adding this work around to have the file properly renamed.
     // Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL.
-    tasks.named("assembleDistRelease").configure {
-        def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
-        print "Build file $buildFile"
-        doLast {
-            println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
-            if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
-                println "Rename failed!"
-            }
-        }
-    }
+//    tasks.named("assembleDistRelease").configure {
+//        def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
+//        print "Build file $buildFile"
+//        doLast {
+//            println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
+//            if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
+//                println "Rename failed!"
+//            }
+//        }
+//    }
     publishing {
         publications {
             msal(MavenPublication) {
+0 −3		changelog.txt
+1 −1		common/build.gradle
+1 −1		common4j/versioning/version.properties
+1 −1		versioning/version.properties