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 ... 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 ---------- diff --git a/common b/common index e443777597..7baab46fa3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e443777597591d391c8390856554ed12a6bb080c +Subproject commit 7baab46fa3b257310ee79b43d60c0fa588c8a993 diff --git a/gradle.properties b/gradle.properties index 0a39b31619..59254c6da4 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 +# 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 abiSelection=x86_64 \ No newline at end of file diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 87dbbd8999..8124fba715 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,7 @@ ext { buildToolsVersion = "28.0.3" // Plugins - gradleVersion = '7.4.2' + gradleVersion = '8.1.1' kotlinVersion = '1.7.21' spotBugsGradlePluginVersion = '4.7.1' jupiterApiVersion = '5.6.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59e4bcc822..d536f56aaa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +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 diff --git a/msal/build.gradle b/msal/build.gradle index 08683e128b..8c7bb8a7f3 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.5' id 'com.android.library' id 'pmd' id 'checkstyle' @@ -44,7 +44,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 +71,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 @@ -163,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') @@ -172,17 +174,16 @@ task javadoc(type: Javadoc) { exclude '**/R.java' destinationDir = reporting.file("$project.buildDir/outputs/jar/javadoc/") } - // 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/") } @@ -300,8 +301,8 @@ task pmd(type: Pmd) { source = fileTree('src/main/java') reports { - xml.enabled = false - html.enabled = true + xml.required = false + html.required = true } } @@ -322,7 +323,7 @@ afterEvaluate { publishing { publications { msal(MavenPublication) { - from components.distRelease + 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..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 bd511ce7f5..2a1cdcc138 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -14,7 +14,7 @@ if (project.hasProperty("localFlights")) { } android { - + namespace "com.microsoft.identity.client.msal.automationapp" packagingOptions { pickFirst 'META-INF/common4j.kotlin_module' } @@ -26,7 +26,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..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 cfaaa34677..63a1ae5236 100644 --- a/package-inspector/build.gradle +++ b/package-inspector/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace "com.microsoft.inspector" compileOptions { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true 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"> - + - + xmlns:tools="http://schemas.android.com/tools">