From 3c8c21128497bbba0767c316832e378445b5cf4b Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 17 Jan 2025 15:58:01 -0800 Subject: [PATCH 01/39] First commit --- msal/build.gradle | 33 ++++++++++++++----- msal/src/main/AndroidManifest.xml | 4 +-- msalautomationapp/build.gradle | 18 ++++++++-- .../src/androidTest/AndroidManifest.xml | 4 +-- package-inspector/build.gradle | 13 +++++++- testapps/testapp/build.gradle | 15 +++++++-- testapps/testapp/src/main/AndroidManifest.xml | 7 ++-- 7 files changed, 73 insertions(+), 21 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 08683e128b..df6f018472 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -30,7 +30,17 @@ if (project.hasProperty("codeCoverageEnabled")) { codeCoverageReport { coverage.enabled = enableCodeCoverage } - +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} android { // testOptions { // compileOptions { @@ -44,7 +54,7 @@ android { // coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion" // } // } - + namespace "com.microsoft.identity.msal" compileOptions { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true @@ -71,6 +81,9 @@ android { project.version = android.defaultConfig.versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + buildConfig = true + } buildTypes { // testCoverageEnabled flag is set to true to get coverage reports for Android Tests @@ -176,13 +189,15 @@ task javadoc(type: Javadoc) { // Task to generate javadoc.jar task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir - classifier 'javadoc' +// classifier 'javadoc' + archiveClassifier.set('javadoc') destinationDirectory = reporting.file("$project.buildDir/outputs/jar/") } task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier 'sources' +// classifier 'sources' + archiveClassifier.set('sources') destinationDirectory = reporting.file("$project.buildDir/outputs/jar/") } @@ -300,8 +315,8 @@ task pmd(type: Pmd) { source = fileTree('src/main/java') reports { - xml.enabled = false - html.enabled = true + xml.required = false + html.required = true } } @@ -321,8 +336,10 @@ afterEvaluate { // } publishing { publications { - msal(MavenPublication) { - from components.distRelease + distRelease(MavenPublication) { + +// msal(MavenPublication) { + from components.findByName('distRelease') groupId 'com.microsoft.identity.client' artifactId 'msal' //Edit the 'version' here for VSTS RC build diff --git a/msal/src/main/AndroidManifest.xml b/msal/src/main/AndroidManifest.xml index f5a37938fd..9df7345bab 100644 --- a/msal/src/main/AndroidManifest.xml +++ b/msal/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index bd511ce7f5..2b44b4b80b 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -12,9 +12,19 @@ def copyOfLocalFlights = "" if (project.hasProperty("localFlights")) { copyOfLocalFlights = localFlights } - +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} android { - + namespace "com.microsoft.identity.client.msal.automationapp" packagingOptions { pickFirst 'META-INF/common4j.kotlin_module' } @@ -26,7 +36,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - + buildFeatures { + buildConfig = true + } final String BROKER_HOST = "BrokerHost" final String BROKER_MICROSOFT_AUTHENTICATOR = "BrokerMicrosoftAuthenticator" final String BROKER_COMPANY_PORTAL = "BrokerCompanyPortal" diff --git a/msalautomationapp/src/androidTest/AndroidManifest.xml b/msalautomationapp/src/androidTest/AndroidManifest.xml index 5dcf19d28e..f0f77a2688 100644 --- a/msalautomationapp/src/androidTest/AndroidManifest.xml +++ b/msalautomationapp/src/androidTest/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index cfaaa34677..6b2675ea99 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -1,6 +1,17 @@ apply plugin: 'com.android.application' - +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} android { + namespace "com.microsoft.inspector" compileOptions { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle index 9b22cc3ffd..86cbfd8399 100644 --- a/testapps/testapp/build.gradle +++ b/testapps/testapp/build.gradle @@ -40,9 +40,19 @@ def otelAriaToken = "" if(project.hasProperty('otelAriaToken')) { otelAriaToken = project.otelAriaToken; } - +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} android { - + namespace "com.microsoft.identity.client.testapp" // Bumping up to Java Version 8 due to the addition of YubiKit SDK, // which uses Version 8. Host apps that use libraries dependent on version 8 // must also integrate version 8. @@ -89,6 +99,7 @@ android { } buildFeatures { viewBinding true + buildConfig true } lintOptions { abortOnError false diff --git a/testapps/testapp/src/main/AndroidManifest.xml b/testapps/testapp/src/main/AndroidManifest.xml index 8413ff27fa..ab3e577dac 100644 --- a/testapps/testapp/src/main/AndroidManifest.xml +++ b/testapps/testapp/src/main/AndroidManifest.xml @@ -24,10 +24,11 @@ ~ // THE SOFTWARE. --> + + + - + xmlns:tools="http://schemas.android.com/tools"> Date: Fri, 24 Jan 2025 10:51:15 -0800 Subject: [PATCH 02/39] msal builds with gradle change --- gradle.properties | 3 ++- gradle/versions.gradle | 3 ++- msal/build.gradle | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0a39b31619..a4d1106c63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,8 @@ org.gradle.daemon=true # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted # we must make sure that the total size is <7G, as that's the RAM size of VM on the build pipeline. -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError +#org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError # For OneAuth default abiSelection abiSelection=x86_64 \ No newline at end of file diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 87dbbd8999..88028b6e53 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,8 @@ ext { buildToolsVersion = "28.0.3" // Plugins - gradleVersion = '7.4.2' +// gradleVersion = '7.4.2' + gradleVersion = '8.1.1' kotlinVersion = '1.7.21' spotBugsGradlePluginVersion = '4.7.1' jupiterApiVersion = '5.6.0' diff --git a/msal/build.gradle b/msal/build.gradle index df6f018472..50779feaea 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -176,7 +176,7 @@ task javadoc(type: Javadoc) { source = android.sourceSets.main.java.srcDirs configurations.api.setCanBeResolved(true) classpath += configurations.api - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) options.memberLevel = JavadocMemberLevel.PUBLIC options.addStringOption('Xdoclint:none', '-quiet') @@ -185,7 +185,9 @@ task javadoc(type: Javadoc) { exclude '**/R.java' destinationDir = reporting.file("$project.buildDir/outputs/jar/javadoc/") } - +afterEvaluate { + tasks.javadoc.classpath += files(project.android.getBootClasspath()) +} // Task to generate javadoc.jar task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir From 93c642c6e9908007e04c2b708e2155149210b924 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Tue, 4 Feb 2025 16:43:59 -0800 Subject: [PATCH 03/39] commiting after rollback --- gradle/wrapper/gradle-wrapper.properties | 3 ++- pop-benchmarker/build.gradle | 1 + pop-benchmarker/src/main/AndroidManifest.xml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59e4bcc822..4f6df5d4b6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip diff --git a/pop-benchmarker/build.gradle b/pop-benchmarker/build.gradle index ed52434e1c..ec757d1f7f 100644 --- a/pop-benchmarker/build.gradle +++ b/pop-benchmarker/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace "com.microsoft.identity.common.internal.platform" compileOptions { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true diff --git a/pop-benchmarker/src/main/AndroidManifest.xml b/pop-benchmarker/src/main/AndroidManifest.xml index 2036731058..a5d1240bfd 100644 --- a/pop-benchmarker/src/main/AndroidManifest.xml +++ b/pop-benchmarker/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + Date: Wed, 5 Feb 2025 10:26:49 -0800 Subject: [PATCH 04/39] updating msal piplines to jdk17 --- azure-pipelines/pull-request-validation/pr-msal.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 0feadba60b..6dd8ce03ff 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -7,7 +7,7 @@ name: $(date:yyyyMMdd)$(rev:.r) trigger: none variables: - name: BuildParameters.jdkVersion - value: 1.11 + value: 1.17 - name: BuildParameters.jdkArchitecture value: x64 - name: BuildParameters.javaHomeSelection @@ -40,9 +40,9 @@ jobs: persistCredentials: True - template: azure-pipelines/templates/steps/automation-cert.yml@common - task: JavaToolInstaller@0 - displayName: Use Java 11 + displayName: Use Java 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: x64 jdkSourceOption: PreInstalled - task: CodeQL3000Init@0 @@ -62,7 +62,7 @@ jobs: inputs: tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=$(LabVaultAppCert) -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}} -PmockApiUrl=$(MOCK_API_URL) javaHomeSelection: $(BuildParameters.javaHomeSelection) - jdkVersion: 1.11 + jdkVersion: 1.17 - job: spotbugs displayName: SpotBugs cancelTimeoutInMinutes: 1 @@ -92,6 +92,6 @@ jobs: inputs: tasks: clean msal:lintLocalDebug publishJUnitResults: false - jdkVersion: 1.11 + jdkVersion: 1.17 ... From f23749a724714bcaf330b96d358ecf9a50c649dd Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 7 Feb 2025 09:55:59 -0800 Subject: [PATCH 05/39] updating msal pipelin --- azure-pipelines/pull-request-validation/pr-msal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 6dd8ce03ff..30af3e92fa 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -64,7 +64,7 @@ jobs: javaHomeSelection: $(BuildParameters.javaHomeSelection) jdkVersion: 1.17 - job: spotbugs - displayName: SpotBugs + displayName: SpotBugsTEST cancelTimeoutInMinutes: 1 steps: - checkout: self From 2713ba68d2270711188ac142cd0967441367c35a Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 7 Feb 2025 14:56:20 -0800 Subject: [PATCH 06/39] printing java version in pipeline --- azure-pipelines/pull-request-validation/pr-msal.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 30af3e92fa..3823de1dac 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -45,6 +45,8 @@ jobs: versionSpec: '17' jdkArchitectureOption: x64 jdkSourceOption: PreInstalled + - script: java -version + displayName: Print Java Version - task: CodeQL3000Init@0 - task: Gradle@2 name: Gradle1 From 6710ad5bf74d9fec0db43886fbcfa28cba8c7dae Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 20 Feb 2025 13:53:35 -0800 Subject: [PATCH 07/39] removing printing script --- azure-pipelines/pull-request-validation/pr-msal.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 3823de1dac..30af3e92fa 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -45,8 +45,6 @@ jobs: versionSpec: '17' jdkArchitectureOption: x64 jdkSourceOption: PreInstalled - - script: java -version - displayName: Print Java Version - task: CodeQL3000Init@0 - task: Gradle@2 name: Gradle1 From 40545a95301c5d20c02f32bf60c0443c89dd2d0e Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 20 Feb 2025 13:59:42 -0800 Subject: [PATCH 08/39] updating buildsystem plugin version to 0.2.4 --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index 50779feaea..68dcfe262e 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.microsoft.identity.buildsystem' version '0.2.3' + id 'com.microsoft.identity.buildsystem' version '0.2.4' id 'com.android.library' id 'pmd' id 'checkstyle' From 2602f77e5498e6cd33a91f9d6e74009bc39e36f5 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 21 Feb 2025 16:59:31 -0800 Subject: [PATCH 09/39] fixing the msal publish task --- msal/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 68dcfe262e..eecffab770 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -338,9 +338,9 @@ afterEvaluate { // } publishing { publications { - distRelease(MavenPublication) { +// distRelease(MavenPublication) { -// msal(MavenPublication) { + msal(MavenPublication) { from components.findByName('distRelease') groupId 'com.microsoft.identity.client' artifactId 'msal' From 095656b7f9aece634939c91682ad943d5acbe90b Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Mon, 24 Feb 2025 15:16:23 -0800 Subject: [PATCH 10/39] making default java 17 --- msal/build.gradle | 4 ++-- msalautomationapp/build.gradle | 4 ++-- package-inspector/build.gradle | 4 ++-- pop-benchmarker/build.gradle | 4 ++-- testapps/testapp/build.gradle | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index eecffab770..edd4a99fba 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -59,8 +59,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index 2b44b4b80b..1a4055c9ff 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -33,8 +33,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildFeatures { buildConfig = true diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index 6b2675ea99..308325a540 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -16,8 +16,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } compileSdk rootProject.ext.compileSdkVersion defaultConfig { diff --git a/pop-benchmarker/build.gradle b/pop-benchmarker/build.gradle index ec757d1f7f..072ffbc9b9 100644 --- a/pop-benchmarker/build.gradle +++ b/pop-benchmarker/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle index 86cbfd8399..8ca6587560 100644 --- a/testapps/testapp/build.gradle +++ b/testapps/testapp/build.gradle @@ -60,8 +60,8 @@ android { // Flag to enable support for the new language APIs //coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } From 9d42411c112d1455b0e89004bf4d5b2cf565e670 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Mon, 24 Feb 2025 16:47:34 -0800 Subject: [PATCH 11/39] rolling back some changes to java upgrade --- msal/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index edd4a99fba..eecffab770 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -59,8 +59,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } From d84a346503a75ce331b277306bcee44e47a1cc23 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 27 Feb 2025 09:41:07 -0800 Subject: [PATCH 12/39] adding production flavour --- msal/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/msal/build.gradle b/msal/build.gradle index eecffab770..ce82b526ba 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -139,6 +139,9 @@ android { dist { dimension "main" } + production { + dimension "main" + } } sourceSets { From 99981586ff181c3cd2d5a05fc8e7d46c26be0e47 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 28 Feb 2025 11:19:03 -0800 Subject: [PATCH 13/39] adding matchingFallbacks in msal --- msal/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/msal/build.gradle b/msal/build.gradle index ce82b526ba..211da808f0 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -141,6 +141,7 @@ android { } production { dimension "main" + matchingFallbacks = ['dist'] } } From bc23bbacc2dade484e32450e76178ddb0a3138da Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 26 Mar 2025 12:42:28 -0700 Subject: [PATCH 14/39] updating gradle --- msal/build.gradle | 22 +++++++++++----------- msalautomationapp/build.gradle | 22 +++++++++++----------- package-inspector/build.gradle | 22 +++++++++++----------- testapps/testapp/build.gradle | 22 +++++++++++----------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 211da808f0..5d10faa208 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -30,17 +30,17 @@ if (project.hasProperty("codeCoverageEnabled")) { codeCoverageReport { coverage.enabled = enableCodeCoverage } -subprojects { - afterEvaluate { project -> - if (project.hasProperty('android')) { - project.android { - if (namespace == null) { - namespace project.group - } - } - } - } -} +//subprojects { +// afterEvaluate { project -> +// if (project.hasProperty('android')) { +// project.android { +// if (namespace == null) { +// namespace project.group +// } +// } +// } +// } +//} android { // testOptions { // compileOptions { diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index 1a4055c9ff..2b50941986 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -12,17 +12,17 @@ def copyOfLocalFlights = "" if (project.hasProperty("localFlights")) { copyOfLocalFlights = localFlights } -subprojects { - afterEvaluate { project -> - if (project.hasProperty('android')) { - project.android { - if (namespace == null) { - namespace project.group - } - } - } - } -} +//subprojects { +// afterEvaluate { project -> +// if (project.hasProperty('android')) { +// project.android { +// if (namespace == null) { +// namespace project.group +// } +// } +// } +// } +//} android { namespace "com.microsoft.identity.client.msal.automationapp" packagingOptions { diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index 308325a540..71b418c430 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' -subprojects { - afterEvaluate { project -> - if (project.hasProperty('android')) { - project.android { - if (namespace == null) { - namespace project.group - } - } - } - } -} +//subprojects { +// afterEvaluate { project -> +// if (project.hasProperty('android')) { +// project.android { +// if (namespace == null) { +// namespace project.group +// } +// } +// } +// } +//} android { namespace "com.microsoft.inspector" compileOptions { diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle index 8ca6587560..cdf7465886 100644 --- a/testapps/testapp/build.gradle +++ b/testapps/testapp/build.gradle @@ -40,17 +40,17 @@ def otelAriaToken = "" if(project.hasProperty('otelAriaToken')) { otelAriaToken = project.otelAriaToken; } -subprojects { - afterEvaluate { project -> - if (project.hasProperty('android')) { - project.android { - if (namespace == null) { - namespace project.group - } - } - } - } -} +//subprojects { +// afterEvaluate { project -> +// if (project.hasProperty('android')) { +// project.android { +// if (namespace == null) { +// namespace project.group +// } +// } +// } +// } +//} android { namespace "com.microsoft.identity.client.testapp" // Bumping up to Java Version 8 due to the addition of YubiKit SDK, From 73ee1f1b740fe3c819bb67bc558c9e6dd3808de9 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 28 Mar 2025 13:12:50 -0700 Subject: [PATCH 15/39] nit --- azure-pipelines/pull-request-validation/pr-msal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 30af3e92fa..6dd8ce03ff 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -64,7 +64,7 @@ jobs: javaHomeSelection: $(BuildParameters.javaHomeSelection) jdkVersion: 1.17 - job: spotbugs - displayName: SpotBugsTEST + displayName: SpotBugs cancelTimeoutInMinutes: 1 steps: - checkout: self From 9988cd479281cbda4715e07a2d75c9eb421e408a Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 28 Mar 2025 13:14:17 -0700 Subject: [PATCH 16/39] nit --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a4d1106c63..cfdb4e53ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,6 @@ org.gradle.daemon=true # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted # we must make sure that the total size is <7G, as that's the RAM size of VM on the build pipeline. -#org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError # For OneAuth default abiSelection From 5afc9795ddffe0d78ed5a896ba1fb1e468751c03 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 28 Mar 2025 15:39:14 -0700 Subject: [PATCH 17/39] nits --- gradle/wrapper/gradle-wrapper.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4f6df5d4b6..d536f56aaa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -#distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip From e20750e5f979286e3a0bb2fe0d5694bb8a3dd12c Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 28 Mar 2025 16:08:26 -0700 Subject: [PATCH 18/39] nits removing commented lines --- gradle/versions.gradle | 1 - msal/build.gradle | 12 +----------- msal/src/main/AndroidManifest.xml | 1 - msalautomationapp/build.gradle | 12 +----------- .../src/androidTest/AndroidManifest.xml | 1 - package-inspector/build.gradle | 12 +----------- pop-benchmarker/src/main/AndroidManifest.xml | 1 - testapps/testapp/build.gradle | 12 +----------- testapps/testapp/src/main/AndroidManifest.xml | 3 --- 9 files changed, 4 insertions(+), 51 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 88028b6e53..8124fba715 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,6 @@ ext { buildToolsVersion = "28.0.3" // Plugins -// gradleVersion = '7.4.2' gradleVersion = '8.1.1' kotlinVersion = '1.7.21' spotBugsGradlePluginVersion = '4.7.1' diff --git a/msal/build.gradle b/msal/build.gradle index 5d10faa208..a7924b5dfd 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -30,17 +30,7 @@ if (project.hasProperty("codeCoverageEnabled")) { codeCoverageReport { coverage.enabled = enableCodeCoverage } -//subprojects { -// afterEvaluate { project -> -// if (project.hasProperty('android')) { -// project.android { -// if (namespace == null) { -// namespace project.group -// } -// } -// } -// } -//} + android { // testOptions { // compileOptions { diff --git a/msal/src/main/AndroidManifest.xml b/msal/src/main/AndroidManifest.xml index 9df7345bab..8bb9227fce 100644 --- a/msal/src/main/AndroidManifest.xml +++ b/msal/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index 2b50941986..b6cf6b91d2 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -12,17 +12,7 @@ def copyOfLocalFlights = "" if (project.hasProperty("localFlights")) { copyOfLocalFlights = localFlights } -//subprojects { -// afterEvaluate { project -> -// if (project.hasProperty('android')) { -// project.android { -// if (namespace == null) { -// namespace project.group -// } -// } -// } -// } -//} + android { namespace "com.microsoft.identity.client.msal.automationapp" packagingOptions { diff --git a/msalautomationapp/src/androidTest/AndroidManifest.xml b/msalautomationapp/src/androidTest/AndroidManifest.xml index f0f77a2688..cf374ca2fd 100644 --- a/msalautomationapp/src/androidTest/AndroidManifest.xml +++ b/msalautomationapp/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index 71b418c430..24f94ba89a 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -1,15 +1,5 @@ apply plugin: 'com.android.application' -//subprojects { -// afterEvaluate { project -> -// if (project.hasProperty('android')) { -// project.android { -// if (namespace == null) { -// namespace project.group -// } -// } -// } -// } -//} + android { namespace "com.microsoft.inspector" compileOptions { diff --git a/pop-benchmarker/src/main/AndroidManifest.xml b/pop-benchmarker/src/main/AndroidManifest.xml index a5d1240bfd..66d59ae4cd 100644 --- a/pop-benchmarker/src/main/AndroidManifest.xml +++ b/pop-benchmarker/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - -// if (project.hasProperty('android')) { -// project.android { -// if (namespace == null) { -// namespace project.group -// } -// } -// } -// } -//} + android { namespace "com.microsoft.identity.client.testapp" // Bumping up to Java Version 8 due to the addition of YubiKit SDK, diff --git a/testapps/testapp/src/main/AndroidManifest.xml b/testapps/testapp/src/main/AndroidManifest.xml index ab3e577dac..28286ca024 100644 --- a/testapps/testapp/src/main/AndroidManifest.xml +++ b/testapps/testapp/src/main/AndroidManifest.xml @@ -24,9 +24,6 @@ ~ // THE SOFTWARE. --> - - - From 9377eb49c7b006bc969b79543c40d55ab5636f32 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Mon, 31 Mar 2025 00:55:53 -0700 Subject: [PATCH 19/39] nits --- msal/build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index a7924b5dfd..e6f50d60bc 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -129,10 +129,6 @@ android { dist { dimension "main" } - production { - dimension "main" - matchingFallbacks = ['dist'] - } } sourceSets { @@ -170,7 +166,6 @@ task javadoc(type: Javadoc) { source = android.sourceSets.main.java.srcDirs configurations.api.setCanBeResolved(true) classpath += configurations.api -// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) options.memberLevel = JavadocMemberLevel.PUBLIC options.addStringOption('Xdoclint:none', '-quiet') From b9df2bd12c8ab33e27ac257369dd95b327ef88dc Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 2 Apr 2025 14:31:33 -0700 Subject: [PATCH 20/39] nits --- msal/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index e6f50d60bc..52f1beec91 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -180,14 +180,12 @@ afterEvaluate { // Task to generate javadoc.jar task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir -// classifier 'javadoc' archiveClassifier.set('javadoc') destinationDirectory = reporting.file("$project.buildDir/outputs/jar/") } task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs -// classifier 'sources' archiveClassifier.set('sources') destinationDirectory = reporting.file("$project.buildDir/outputs/jar/") } @@ -327,8 +325,6 @@ afterEvaluate { // } publishing { publications { -// distRelease(MavenPublication) { - msal(MavenPublication) { from components.findByName('distRelease') groupId 'com.microsoft.identity.client' From 501eb9c6f0c5395446abfa46a5b9c76bc58a4145 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 2 Apr 2025 18:11:43 -0700 Subject: [PATCH 21/39] updating common --- msal/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 52f1beec91..4ba31ab173 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -49,8 +49,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_17 + targetCompatibility JavaVersion.VERSION_1_17 } From 73f8ec38d2a961deab40f705579011c4dd96c7e8 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 3 Apr 2025 15:47:11 -0700 Subject: [PATCH 22/39] reverting to java 8 --- msal/build.gradle | 4 ++-- msalautomationapp/build.gradle | 4 ++-- package-inspector/build.gradle | 4 ++-- pop-benchmarker/build.gradle | 4 ++-- testapps/testapp/build.gradle | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 4ba31ab173..52f1beec91 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -49,8 +49,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_17 - targetCompatibility JavaVersion.VERSION_1_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index b6cf6b91d2..2a1cdcc138 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -23,8 +23,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } buildFeatures { buildConfig = true diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index 24f94ba89a..63a1ae5236 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } compileSdk rootProject.ext.compileSdkVersion defaultConfig { diff --git a/pop-benchmarker/build.gradle b/pop-benchmarker/build.gradle index 072ffbc9b9..ec757d1f7f 100644 --- a/pop-benchmarker/build.gradle +++ b/pop-benchmarker/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle index 4538678d52..c6807826c2 100644 --- a/testapps/testapp/build.gradle +++ b/testapps/testapp/build.gradle @@ -50,8 +50,8 @@ android { // Flag to enable support for the new language APIs //coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } From b19939194ebd4d64c7713b2b960ecee5d8c6919a Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 3 Apr 2025 16:19:31 -0700 Subject: [PATCH 23/39] reverting plugin upgrade --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index 52f1beec91..0d0581b85a 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.microsoft.identity.buildsystem' version '0.2.4' + id 'com.microsoft.identity.buildsystem' version '0.2.3' id 'com.android.library' id 'pmd' id 'checkstyle' From f269cfcedc636ab3a12ea572f1f64f9fb5ef6733 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Mon, 7 Apr 2025 14:55:09 -0700 Subject: [PATCH 24/39] new plugin --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index 0d0581b85a..acb190d064 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.microsoft.identity.buildsystem' version '0.2.3' + id 'com.microsoft.identity.buildsystem' version '0.2.4-1' id 'com.android.library' id 'pmd' id 'checkstyle' From 13398c4d37c00a864dfaf7c6cdb34677c4575ed1 Mon Sep 17 00:00:00 2001 From: jeffrymsft Date: Mon, 7 Apr 2025 21:35:31 -0700 Subject: [PATCH 25/39] Update pr-msal.yml for Azure Pipelines --- azure-pipelines/pull-request-validation/pr-msal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 6dd8ce03ff..2ec490d6b1 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -22,7 +22,7 @@ resources: - repository: common type: github name: AzureAD/microsoft-authentication-library-common-for-android - ref: dev + ref: gradleVersionChange2 endpoint: ANDROID_GITHUB pool: From 6a9520f5ed85c5dc277d40e571b38aea37184156 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 10 Apr 2025 15:54:38 -0700 Subject: [PATCH 26/39] new plugin version 0.2.5 --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index acb190d064..4872e762b4 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.microsoft.identity.buildsystem' version '0.2.4-1' + id 'com.microsoft.identity.buildsystem' version '0.2.5' id 'com.android.library' id 'pmd' id 'checkstyle' From 92a06f5028f4bd3b6867dfd290f8ca58c531f542 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Fri, 11 Apr 2025 19:13:30 -0700 Subject: [PATCH 27/39] testing if need a thing --- msal/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 4872e762b4..64dcc8f179 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -174,9 +174,9 @@ task javadoc(type: Javadoc) { exclude '**/R.java' destinationDir = reporting.file("$project.buildDir/outputs/jar/javadoc/") } -afterEvaluate { - tasks.javadoc.classpath += files(project.android.getBootClasspath()) -} +//afterEvaluate { +// tasks.javadoc.classpath += files(project.android.getBootClasspath()) +//} // Task to generate javadoc.jar task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir From 6137124079057787b827e4e0392645f7f5bb8d7b Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Tue, 15 Apr 2025 11:23:24 -0700 Subject: [PATCH 28/39] reverting to 0.2.4-1 --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index 64dcc8f179..dd80c9e425 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.microsoft.identity.buildsystem' version '0.2.5' + id 'com.microsoft.identity.buildsystem' version '0.2.4-1' id 'com.android.library' id 'pmd' id 'checkstyle' From c7ed088de924d6d2eba987c3cf621102d8a377cd Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 16 Apr 2025 11:49:09 -0700 Subject: [PATCH 29/39] java11 across the board --- msal/build.gradle | 4 ++-- msalautomationapp/build.gradle | 4 ++-- package-inspector/build.gradle | 4 ++-- pop-benchmarker/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index dd80c9e425..310cea6842 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -49,8 +49,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index 2a1cdcc138..b35d3b6236 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -23,8 +23,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } buildFeatures { buildConfig = true diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index 63a1ae5236..1d03c3d46d 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdk rootProject.ext.compileSdkVersion defaultConfig { diff --git a/pop-benchmarker/build.gradle b/pop-benchmarker/build.gradle index ec757d1f7f..6287e8ee28 100644 --- a/pop-benchmarker/build.gradle +++ b/pop-benchmarker/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion From 05c89b5927117f97a92d8a408ea646dcc6c2329f Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 16 Apr 2025 15:25:39 -0700 Subject: [PATCH 30/39] back to 8 --- msal/build.gradle | 4 ++-- msalautomationapp/build.gradle | 4 ++-- package-inspector/build.gradle | 4 ++-- pop-benchmarker/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index 310cea6842..dd80c9e425 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -49,8 +49,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index b35d3b6236..2a1cdcc138 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -23,8 +23,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } buildFeatures { buildConfig = true diff --git a/package-inspector/build.gradle b/package-inspector/build.gradle index 1d03c3d46d..63a1ae5236 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } compileSdk rootProject.ext.compileSdkVersion defaultConfig { diff --git a/pop-benchmarker/build.gradle b/pop-benchmarker/build.gradle index 6287e8ee28..ec757d1f7f 100644 --- a/pop-benchmarker/build.gradle +++ b/pop-benchmarker/build.gradle @@ -6,8 +6,8 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion From e3e8b731227c7cb98c0480e38da1c352d47435b1 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 16 Apr 2025 15:49:50 -0700 Subject: [PATCH 31/39] nits --- msal/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index dd80c9e425..708b0d6389 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -174,9 +174,6 @@ task javadoc(type: Javadoc) { exclude '**/R.java' destinationDir = reporting.file("$project.buildDir/outputs/jar/javadoc/") } -//afterEvaluate { -// tasks.javadoc.classpath += files(project.android.getBootClasspath()) -//} // Task to generate javadoc.jar task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir From 65c85d726195f90284b69548e3e1260b1d874e92 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Wed, 16 Apr 2025 15:53:16 -0700 Subject: [PATCH 32/39] back 0.2.5 --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index 708b0d6389..8c7bb8a7f3 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.microsoft.identity.buildsystem' version '0.2.4-1' + id 'com.microsoft.identity.buildsystem' version '0.2.5' id 'com.android.library' id 'pmd' id 'checkstyle' From d5fcbca7f4e5b25ebd6da71d5146bf0fa53e5862 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 17 Apr 2025 12:09:11 -0700 Subject: [PATCH 33/39] updating changelog --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 99ff15c1e3..21569daede 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- +- [MINOR] Update AGP Version to 8.1.0 (#2254) Version 6.1.1 ---------- From c8afc0d7e05ba48fd93d973319b471af36b4db9b Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Thu, 17 Apr 2025 14:32:01 -0700 Subject: [PATCH 34/39] removing package --- package-inspector/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package-inspector/src/main/AndroidManifest.xml b/package-inspector/src/main/AndroidManifest.xml index 0bc6950e34..4e9392734d 100644 --- a/package-inspector/src/main/AndroidManifest.xml +++ b/package-inspector/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> Date: Fri, 18 Apr 2025 13:57:56 -0700 Subject: [PATCH 35/39] nits --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index cfdb4e53ee..59254c6da4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,7 @@ org.gradle.daemon=true # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted # we must make sure that the total size is <7G, as that's the RAM size of VM on the build pipeline. +# MaxMetaspaceSize replaced MaxPermSize as of java 8+.https://www.oracle.com/java/technologies/javase/8-whats-new.html org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError # For OneAuth default abiSelection From 67c03be4ece1bc4e67794ad2df33b8b772733313 Mon Sep 17 00:00:00 2001 From: t-jeffzhang Date: Tue, 22 Apr 2025 12:48:02 -0700 Subject: [PATCH 36/39] prs back to dev --- azure-pipelines/pull-request-validation/pr-msal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml index 2ec490d6b1..6dd8ce03ff 100644 --- a/azure-pipelines/pull-request-validation/pr-msal.yml +++ b/azure-pipelines/pull-request-validation/pr-msal.yml @@ -22,7 +22,7 @@ resources: - repository: common type: github name: AzureAD/microsoft-authentication-library-common-for-android - ref: gradleVersionChange2 + ref: dev endpoint: ANDROID_GITHUB pool: From a5883e261ffa93e0ffc489bb93d2590877328488 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Mon, 23 Jun 2025 09:37:38 -0700 Subject: [PATCH 37/39] updated common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index e443777597..b37cfb0f45 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e443777597591d391c8390856554ed12a6bb080c +Subproject commit b37cfb0f45d13ee521e54d1319a3d22a548fe0cf From 3fb24f80792c83f9557e57214437c0b28b12cfc2 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Mon, 23 Jun 2025 12:37:37 -0700 Subject: [PATCH 38/39] updated latest common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index b37cfb0f45..7baab46fa3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b37cfb0f45d13ee521e54d1319a3d22a548fe0cf +Subproject commit 7baab46fa3b257310ee79b43d60c0fa588c8a993 From cc548391c65994d14322e30ef1266ff2dfd71f1e Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Mon, 23 Jun 2025 13:32:37 -0700 Subject: [PATCH 39/39] Trigger CLA check