diff --git a/common b/common index 795df0412..6676be01f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 795df0412003912d7aa8402b16f3a03455bd371d +Subproject commit 6676be01fa0334f11ef249f32bef67280484b6f4 diff --git a/msal/build.gradle b/msal/build.gradle index 09ecf4c17..08683e128 100644 --- 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) {