diff --git a/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml b/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml index cb74a971..0b9d0fab 100644 --- a/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml +++ b/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml @@ -286,7 +286,7 @@ stages: ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN: $(mvnPAT) inputs: cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: LinuxBrokerPackage:clean LinuxBrokerPackage:buildDeb $(linuxBrokerVersion) --build-cache --info + tasks: LinuxBrokerPackage:clean LinuxBrokerPackage:buildDebian $(linuxBrokerVersion) --build-cache --info publishJUnitResults: false jdkArchitecture: x86 sqAnalysisBreakBuildIfQualityGateFailed: false diff --git a/azure-pipelines/templates/spotbugs.yml b/azure-pipelines/templates/spotbugs.yml index 2e2337c3..8dd494c9 100644 --- a/azure-pipelines/templates/spotbugs.yml +++ b/azure-pipelines/templates/spotbugs.yml @@ -16,7 +16,7 @@ steps: displayName: 'Run Spotbugs' inputs: javaHomeSelection: JDKVersion - jdkVersionOption: "1.11" + jdkVersionOption: "1.17" jdkArchitecture: x64 cwd: ${{ parameters.cwd }} tasks: ${{ parameters.project }}:${{ parameters.spotbugsCommand }} diff --git a/azure-pipelines/test-app/java-linux-test-app.yml b/azure-pipelines/test-app/java-linux-test-app.yml index 181334e8..121321aa 100644 --- a/azure-pipelines/test-app/java-linux-test-app.yml +++ b/azure-pipelines/test-app/java-linux-test-app.yml @@ -46,7 +46,7 @@ jobs: displayName: Build Deb with Java Dependency inputs: cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: java-linux-test-app:clean java-linux-test-app:buildDeb --build-cache --info + tasks: java-linux-test-app:clean java-linux-test-app:buildDebian --build-cache --info publishJUnitResults: false jdkArchitecture: x86 sqAnalysisBreakBuildIfQualityGateFailed: false @@ -84,7 +84,7 @@ jobs: displayName: Build Rpm with Java Dependency inputs: cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: java-linux-test-app:clean java-linux-test-app:buildRpm --build-cache --info + tasks: java-linux-test-app:clean java-linux-test-app:buildRpmtestapp --build-cache --info publishJUnitResults: false jdkArchitecture: x64 jdkVersionOption: "1.11" diff --git a/azure-pipelines/test-app/microsoft-identity-diagnostics-cd.yml b/azure-pipelines/test-app/microsoft-identity-diagnostics-cd.yml index f895afcc..6a1cc554 100644 --- a/azure-pipelines/test-app/microsoft-identity-diagnostics-cd.yml +++ b/azure-pipelines/test-app/microsoft-identity-diagnostics-cd.yml @@ -50,7 +50,7 @@ jobs: displayName: Build Deb with Java Dependency inputs: cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: microsoft-identity-diagnostics:clean microsoft-identity-diagnostics:buildDeb --build-cache --info + tasks: microsoft-identity-diagnostics:clean microsoft-identity-diagnostics:buildDebian --build-cache --info publishJUnitResults: false jdkArchitecture: x86 sqAnalysisBreakBuildIfQualityGateFailed: false @@ -93,7 +93,7 @@ jobs: displayName: Build Rpm with Java Dependency inputs: cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: microsoft-identity-diagnostics:clean microsoft-identity-diagnostics:buildRpm --build-cache --info + tasks: microsoft-identity-diagnostics:clean microsoft-identity-diagnostics:buildRpmDiag --build-cache --info publishJUnitResults: false jdkArchitecture: x86 sqAnalysisBreakBuildIfQualityGateFailed: false diff --git a/gradle.properties b/gradle.properties index 93191472..3ffcb126 100755 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,19 @@ ariaTenantTokenProd="b6618d4b5d24466a9d2d0d8cde8cd6e4-ddcec952-23e9-4765-b4fb-f8 ariaTenantTokenTest="1e8435186fa849b28b1a402fb5074ff1-0b91a9ec-efad-440c-b92c-ac4cb55ba0ff-7490" android.useAndroidX=true -android.enableJetifier=true - +android.enableJetifier=false +android.nonTransitiveRClass=false +android.nonFinalResIds=false # https://office.visualstudio.com/Outlook%20Mobile/_wiki/wikis/Outlook-Mobile.wiki/3780/Android-Studio-Gradle-Performance-tips-and-tricks org.gradle.parallel=true org.gradle.daemon=true +org.gradle.warning.mode=all +android.defaults.buildfeatures.buildconfig=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 + # This the TSL versionName... versionName=1.5.9 diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 196f458e..d6b7ee9b 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -8,8 +8,9 @@ ext { compileSdkVersion = 34 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' @@ -47,7 +48,7 @@ ext { uiAutomatorVersion = "2.2.0" daggerVersion = "2.31.2" daggerCompilerVersion = "2.31.2" - msal4jVersion = "1.10.0" + msal4jVersion = "1.20.1" mseberaApacheHttpClientVersion = "4.5.8" moshiVersion = "1.14.0" moshiAdaptersVersion = "1.14.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59e4bcc8..c0d0135f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 13:15:58 PDT 2020 +#Thu Jan 30 09:54:20 PST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/java-complete/gradle/versions.gradle b/java-complete/gradle/versions.gradle index 87b896e8..8a656696 100644 --- a/java-complete/gradle/versions.gradle +++ b/java-complete/gradle/versions.gradle @@ -1,7 +1,7 @@ // Variables for entire project ext { // SDK - minSdkVersion = 16 + minSdkVersion = 21 brokerProjectMinSdkVersion = 24 automationAppMinSDKVersion = 21 targetSdkVersion = 30 @@ -9,7 +9,7 @@ ext { buildToolsVersion = "28.0.3" // Plugins - gradleVersion = '4.2.2' + gradleVersion = '8.1.1' kotlinVersion = '1.7.21' spotBugsGradlePluginVersion = '4.7.1' jupiterApiVersion = '5.6.0' diff --git a/java-complete/gradle/wrapper/gradle-wrapper.properties b/java-complete/gradle/wrapper/gradle-wrapper.properties index 59e4bcc8..d536f56a 100644 --- a/java-complete/gradle/wrapper/gradle-wrapper.properties +++ b/java-complete/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/plugins/buildsystem/build.gradle b/plugins/buildsystem/build.gradle index b4b0bba2..fe64581f 100644 --- a/plugins/buildsystem/build.gradle +++ b/plugins/buildsystem/build.gradle @@ -6,26 +6,33 @@ plugins { id 'java-gradle-plugin' id 'org.jetbrains.kotlin.jvm' id 'maven-publish' - id 'com.gradle.plugin-publish' version '0.14.0' + id 'com.gradle.plugin-publish' version '1.3.0' } group 'com.microsoft.identity' -version '0.2.3' +version '0.2.5' +tasks.withType(JavaCompile) { + sourceCompatibility = '11' + targetCompatibility = '11' +} -pluginBundle { - website = 'https://github.com/azuread' - vcsUrl = 'https://github.com/azuread/android-complete' - tags = ['build'] +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = '11' + } } gradlePlugin { + website.set('https://github.com/azuread') + vcsUrl.set('https://github.com/azuread/android-complete') plugins { buildPlugin { id = 'com.microsoft.identity.buildsystem' implementationClass = 'com.microsoft.identity.buildsystem.BuildPlugin' displayName = "AuthClient Android Build Plugin" description = "Gradle plugin to encapsulate custom build tasks and configuration for AuthClient android projects." + tags.addAll('build', 'msal', 'adal', 'android') } } } diff --git a/plugins/buildsystem/gradle/versions.gradle b/plugins/buildsystem/gradle/versions.gradle index fa6a989a..ab579482 100644 --- a/plugins/buildsystem/gradle/versions.gradle +++ b/plugins/buildsystem/gradle/versions.gradle @@ -3,5 +3,5 @@ ext { kotlinVersion = '1.7.21' spotBugsGradlePluginVersion = '4.7.1' jupiterApiVersion = '5.6.0' - gradleVersion = '4.1.0' + gradleVersion = '8.1.1' } diff --git a/plugins/buildsystem/gradle/wrapper/gradle-wrapper.properties b/plugins/buildsystem/gradle/wrapper/gradle-wrapper.properties index 8049c684..0ad737d5 100644 --- a/plugins/buildsystem/gradle/wrapper/gradle-wrapper.properties +++ b/plugins/buildsystem/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/codecov/CodeCoverage.kt b/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/codecov/CodeCoverage.kt index a567cb9e..7eca0933 100644 --- a/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/codecov/CodeCoverage.kt +++ b/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/codecov/CodeCoverage.kt @@ -186,10 +186,9 @@ object CodeCoverage { private fun configureReport(project: Project, reportTask: JacocoReport, taskName: String) { reportTask.reports { task -> // set the outputs enabled according to configs - task.html.isEnabled = reportExtension.html.enabled - task.xml.isEnabled = reportExtension.xml.enabled - task.csv.isEnabled = reportExtension.csv.enabled - + task.html.required.set(reportExtension.html.enabled) + task.xml.required.set(reportExtension.xml.enabled) + task.csv.required.set(reportExtension.csv.enabled) // default reports path val defaultCommonPath = "${project.buildDir}/reports/jacoco/$taskName" val configuredDestination = reportExtension.destination @@ -197,19 +196,21 @@ object CodeCoverage { // configure destination for html code coverage output if (reportExtension.html.enabled) { val path = File(if (configuredDestination.isNullOrBlank()) "$defaultCommonPath/html" else "${configuredDestination.trim()}/html") - task.html.destination = path + task.html.outputLocation.set(path) + } // configure destination for xml code coverage output if (reportExtension.xml.enabled) { val path = File(if (configuredDestination.isNullOrBlank()) "$defaultCommonPath/${taskName}.xml" else "${configuredDestination.trim()}/${taskName}.xml") - task.xml.destination = path + task.xml.outputLocation.set(path) + } // configure destination for csv code coverage output if (reportExtension.csv.enabled) { val path = File(if (configuredDestination.isNullOrBlank()) "$defaultCommonPath/${taskName}.csv" else "${configuredDestination.trim()}/${taskName}.csv") - task.csv.destination = path + task.csv.outputLocation.set(path) } } } diff --git a/settings.gradle b/settings.gradle index abd5622b..c91d8833 100644 --- a/settings.gradle +++ b/settings.gradle @@ -71,7 +71,6 @@ project(':brokerautomationapp').projectDir = new File('broker/brokerautomationap // //include(":oneauthtestapp") //project(':oneauthtestapp').projectDir = new File('oneauth/testapps/android/oneauthtestapp/app') -// //include(":msalcpptesthost") //project(':msalcpptesthost').projectDir = new File('msalcpp/test/android/testhost/app')