diff --git a/common b/common index 943fc16252..ae351b96dc 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 943fc162520b6c39b97cc59fb44e7f7038429f3e +Subproject commit ae351b96dc477d82ef63308d6281b6bca2d5f6da 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 59de0f5bba..236e8e2c8b 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/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/msal/build.gradle b/msal/build.gradle index 08683e128b..50779feaea 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 @@ -163,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') @@ -172,17 +185,21 @@ 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' +// 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 +317,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 +338,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 3afb23a6c4..e418792c33 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/package-inspector/src/main/AndroidManifest.xml b/package-inspector/src/main/AndroidManifest.xml index 0bc6950e34..418ae3982c 100644 --- a/package-inspector/src/main/AndroidManifest.xml +++ b/package-inspector/src/main/AndroidManifest.xml @@ -1,7 +1,12 @@ +<<<<<<< HEAD + + +======= +>>>>>>> 213efa400651b07ef0ed45687c00dda066a877fb - + + + 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">