Gradle version change3

azure-pipelines/pull-request-validation/pr-msal.yml

@@ -7,7 +7,7 @@ name: $(date:yyyyMMdd)$(rev:.r)
 
 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
 
 ...

gradle.properties

@@ -10,7 +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.
-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

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'

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

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'
@@ -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,19 @@ 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
-    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 +304,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 +326,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

msal/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.identity.msal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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'
     }
@@ -23,10 +23,12 @@ 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
     }
-
     final String BROKER_HOST = "BrokerHost"
     final String BROKER_MICROSOFT_AUTHENTICATOR = "BrokerMicrosoftAuthenticator"
     final String BROKER_COMPANY_PORTAL = "BrokerCompanyPortal"

msalautomationapp/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.identity.client.msal.automationapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

package-inspector/build.gradle

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.microsoft.inspector"
     compileOptions {
         // 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 {

pop-benchmarker/build.gradle

@@ -1,12 +1,13 @@
 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
         // 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

pop-benchmarker/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.identity.common.internal.platform">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

testapps/testapp/build.gradle

@@ -42,16 +42,16 @@ if(project.hasProperty('otelAriaToken')) {
 }
 
 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.
     compileOptions {
         // 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
     }
 
 
@@ -89,6 +89,7 @@ android {
     }
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
     lintOptions {
         abortOnError false

testapps/testapp/src/main/AndroidManifest.xml

@@ -25,9 +25,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.microsoft.identity.client.testapp"
-          xmlns:tools="http://schemas.android.com/tools">
-
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- Camera permission is required for QR + PIN authorization method w/o broker-->
     <uses-feature
         android:name="android.hardware.camera"