Repository navigation
upgrade build tools - #2649
Open
ridam-arora wants to merge 14 commits into
Open
upgrade build tools#2649ridam-arora wants to merge 14 commits into
ridam-arora wants to merge 14 commits into
Conversation
- Gradle wrapper 8.11.1->9.3.1, AGP 8.10.0->9.1.1, Kotlin 1.8.0->2.2.21
- compileSdk 36->37, targetSdk 35->36, buildTools 37.0.0 (minSdk unchanged)
- coroutines 1.6.4->1.9.0 (K2 runTest skew), Robolectric 4.14->4.16.1 (SDK 36 needs JDK 21)
- buildsystem 0.2.5->0.2.6; android.newDsl=false (AGP9 stopgap)
- AGP9 built-in Kotlin (remove kotlin-android, kotlinOptions->kotlin{}), resValues, proguard-optimize
- testapp: fix K2 getChars (cast to GetChars) + pin androidx.core 1.5.0; remove stray import
- common submodule -> ridamarora/sdkupgrade (upgraded common)
- CI: PR-branch jobs (build_test, lint, msalautomationapp) -> JDK 21; dev baseline stays 17
# Conflicts: # common
# Conflicts: # common
… plugin resolves in 1ES
…es-sdk from androidTest manifest
…re without the common checkout (Gradle 9)
msal_default_config is a MAIN resource, so under AGP 9 (non-transitive R only) it lives in the module R (com.microsoft.identity.msal.R), not the androidTest R (…msal.test.R). Fully-qualify the reference; the .test.R import stays for the test_* androidTest resources. Fixes :msal:compileLocalDebugAndroidTestJavaWithJavac 'cannot find symbol msal_default_config'.
# Conflicts: # common
…enting them out Keep ':testapps:automationapp' and ':testapps:sample' as active includes but wrap each in a directory-existence check, so they configure when the project dir is present and don't hard-fail under Gradle 9 when it isn't (a plain checkout only has 'testapp'). Addresses review feedback to not leave these commented.
Merge dev f750efd while preserving compileSdk 37, targetSdk 36, existing minSdk levels and Java 8 bytecode. Advance Common to pushed recovery revision 7f886b336bae320cb8bd6ed7a6da49ab01898c94. Reconcile Kotlin compatibility, coverage inputs, explicit AGP publication components and sample R8 annotation handling. Validated local and pinned distribution assemblies, both 868-test suites, coverage, lint, Android-test compilation and automation/sample builds. Shared SpotBugs NO-SOURCE wiring and the optional benchmark flavor-selection blocker remain documented and acknowledged. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
❌ Work item link check failed. Description does not contain AB#{ID}. Click here to Learn more. |
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The SpotBugs integration can pass as NO-SOURCE under AGP 9 without analyzing the library, silently bypassing an existing CI validation check.
1 open issue
What changed in this PR
This PR upgrades MSAL Android’s build toolchain to Gradle 9.3.1, AGP 9.1.1, and JDK 21, with compatibility updates across the library, test apps, and validation pipelines.
Changes:
- Adopt AGP’s built-in Kotlin support and update SDK and dependency versions.
- Adjust coverage, publication, and project configuration for the upgraded tools and builds without Common sources.
- Update test compatibility, CI Java versions, and contributor verification guidance.
| File | Description |
|---|---|
testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/nativeauth/SignUpPasswordFragment.kt |
Access password characters through GetChars. |
testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/nativeauth/PasswordResetNewPasswordFragment.kt |
Update password extraction for compatibility. |
testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/nativeauth/EmailPasswordSignInSignUpFragment.kt |
Update password extraction in both authentication flows. |
testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/nativeauth/EmailAttributeSignUpFragment.kt |
Copy password characters only when a buffer exists. |
testapps/testapp/proguard-rules.pro |
Suppress warnings for a compile-time annotation. |
testapps/testapp/build.gradle |
Adopt built-in Kotlin and adjust resource, shrinking, and dependency configuration. |
settings.gradle |
Guard optional projects and update credential-property lookup. |
msalautomationapp/build.gradle |
Adopt built-in Kotlin and explicitly enable resource values. |
msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/nativeauth/SignInEmailPasswordTest.kt |
Remove an unused annotation import. |
msal/src/androidTest/java/com/microsoft/identity/client/PublicClientConfigurationTest.java |
Reference the library’s non-transitive resource class. |
msal/src/androidTest/AndroidManifest.xml |
Remove manifest-level SDK overrides. |
msal/build.gradle |
Update plugins, Kotlin configuration, coverage paths, publication, and conditional dependencies. |
gradle/wrapper/gradle-wrapper.properties |
Upgrade the Gradle wrapper to 9.3.1. |
gradle/versions.gradle |
Update AGP, Kotlin, Android SDK, and test dependencies. |
gradle.properties |
Retain legacy Android DSL compatibility temporarily. |
azure-pipelines/pull-request-validation/pr-msalautomationapp.yml |
Switch automation-app validation to JDK 21. |
azure-pipelines/pull-request-validation/pr-msal.yml |
Switch library validation tasks to JDK 21. |
AGENTS.md |
Document upgraded tooling, distribution checks, and verification limitations. |
Review effort: Balanced
|
|
||
| plugins { | ||
| id 'com.microsoft.identity.buildsystem' version '0.2.5' | ||
| id 'com.microsoft.identity.buildsystem' version '0.3.0' |
Replace eager task realization so SpotBugs discovers AGP javac tasks. Enable XML reports and baseline approved findings by class, method and detector without globally disabling checks. Align the continuation-token nullability contract and make the helper activity template static final. Validated local debug/release and DIST release SpotBugs reports: 157 classes analyzed with zero unsuppressed findings each. Clean assemblies, 65 focused tests, Android-test compilation, lint and publication metadata pass. Existing missing Android/JSON analysis-class diagnostics remain a separate limitation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Consume latest Common dev reconciliation. Validated local debug/release assembly, Android-test compilation, 868 JVM tests with zero failures, coverage, lint and actual SpotBugs analysis. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

No description provided.