From e26168d09b619cb3c66d94c87f8fc7d2bdd99684 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com> Date: Fri, 9 Jun 2023 11:59:44 -0700 Subject: [PATCH 1/4] Merging somalaya/release/4.7.1 to release/4.7.1 (#1736) * updated versions.properties, build.gradle & changeLog * changed RC1 to RC3 as RC1 and RC2 are already pushed in Jul 2022 * updated common to RC2 * version changed to 4.7.0 * updated to RC3 * removed RC tags * updated changeLog, version.props and buildGradle --- adal/build.gradle | 2 +- adal/versioning/version.properties | 2 +- changelog.txt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 53895c4c6..0c1bf666c 100644 --- a/adal/build.gradle +++ b/adal/build.gradle @@ -131,7 +131,7 @@ android { useLibrary 'android.test.mock' } -String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "0.0.+" +String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "13.0.1" dependencies { coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion" diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties index 6b43ecb46..0180d41a5 100644 --- a/adal/versioning/version.properties +++ b/adal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=4.6.0 +versionName=4.7.1 versionCode=1 diff --git a/changelog.txt b/changelog.txt index d7f955740..0f747fe65 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,10 @@ -VNext +Version 4.7.1 ------------- - [MAJOR] Consolidate Storage Supplier (breaking change introduced in common) #1729 - [MINOR] Replacing SHA-1 used in broker validation with SHA-512 (#1732) - [MINOR] Removing thumbprint check from PkeyAuthChallenge (#1733) +- [PATCH] Update common @13.0.1 +- [PATCH] Version 4.7.0 was built with common which had lint errors, updated to consume common after resolving errors Version 4.6.0 ------------- From 2928de1b25f344b4b8ffd00d075e8d9bf84f5dda Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Wed, 26 Jul 2023 09:49:34 -0700 Subject: [PATCH 2/4] target and compile sdk to 34 --- adal/build.gradle | 2 +- changelog.txt | 2 +- common | 2 +- gradle/versions.gradle | 7 ++++--- userappwithbroker/build.gradle | 2 +- userappwithbroker/src/main/AndroidManifest.xml | 3 ++- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 3b732157f..71c4a6569 100644 --- a/adal/build.gradle +++ b/adal/build.gradle @@ -131,7 +131,7 @@ android { useLibrary 'android.test.mock' } -String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "13.0.1" +String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "0.0.+" dependencies { coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion" diff --git a/changelog.txt b/changelog.txt index fb0694504..7217554ec 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,4 @@ -Version 4.7.1 +VNext ------------- - [PATCH] Update YubiKit version to 2.3.0 (#1744) - [PATCH] Fix Adal StorageHelper Decrypt crash (#1751) diff --git a/common b/common index 66fd1bfb8..effb19086 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 66fd1bfb87a6723fa715f0983392aca2af0bd234 +Subproject commit effb1908624d7c6833fe7336269eefb4e17784c5 diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 3873d23a6..cb16ed0d5 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -5,8 +5,9 @@ ext { minSdkVersion = 16 brokerProjectMinSdkVersion = 24 automationAppMinSDKVersion = 21 - targetSdkVersion = 30 - compileSdkVersion = 30 + targetSdkVersion = 34 + compileSdkVersion = 34 + automationAndTestAppCompileSDK = 33 buildToolsVersion = "28.0.3" // Plugins @@ -68,7 +69,7 @@ ext { javaAssistVersion = "3.27.0-GA" yubikitAndroidVersion = "2.3.0" yubikitPivVersion = "2.3.0" - powerliftAndroidVersion="1.0.0" + powerliftAndroidVersion="1.0.3" // microsoft-diagnostics-uploader app versions powerliftVersion = "0.14.7" diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle index bff91834e..0588f9c85 100644 --- a/userappwithbroker/build.gradle +++ b/userappwithbroker/build.gradle @@ -42,7 +42,7 @@ if (project.hasProperty("buildApplicationId")) { println "Using application Id " + destApplicationId android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdkVersion rootProject.ext.automationAndTestAppCompileSDK compileOptions { // Flag to enable support for the new language APIs diff --git a/userappwithbroker/src/main/AndroidManifest.xml b/userappwithbroker/src/main/AndroidManifest.xml index e87814841..acb85d931 100644 --- a/userappwithbroker/src/main/AndroidManifest.xml +++ b/userappwithbroker/src/main/AndroidManifest.xml @@ -18,7 +18,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > From 7923fc63cb2996995cd54f7b30290466d718cfa4 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Wed, 26 Jul 2023 14:01:23 -0700 Subject: [PATCH 3/4] updated changelog --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index 7217554ec..1a51d43af 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ VNext ------------- - [PATCH] Update YubiKit version to 2.3.0 (#1744) - [PATCH] Fix Adal StorageHelper Decrypt crash (#1751) +- [PATCH] Updated target and compile SDK versions to 34 (#1747) Version 4.7.3 ------------- From 21ca27fc3b11dc323ba8715d6c875da77bc2a479 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur Date: Thu, 27 Jul 2023 16:54:13 -0700 Subject: [PATCH 4/4] Increased AGP to 7.4.2 and gradle dist url to 7.5 --- adal/build.gradle | 2 +- gradle/versions.gradle | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- userappwithbroker/build.gradle | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 71c4a6569..d5ae7306d 100644 --- a/adal/build.gradle +++ b/adal/build.gradle @@ -189,7 +189,7 @@ task sourcesJar(type: Jar) { task javadoc(type: Javadoc) { failOnError false source = android.sourceSets.main.java.srcDirs - classpath += configurations.compile + classpath += configurations.implementation classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += configurations.javadocDeps exclude '**/*.aidl' diff --git a/gradle/versions.gradle b/gradle/versions.gradle index cb16ed0d5..ef65176fb 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -7,11 +7,10 @@ ext { automationAppMinSDKVersion = 21 targetSdkVersion = 34 compileSdkVersion = 34 - automationAndTestAppCompileSDK = 33 buildToolsVersion = "28.0.3" // Plugins - gradleVersion = '4.2.2' + gradleVersion = '7.4.2' 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 f08f3db3a..30f80bdcf 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-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle index 0588f9c85..bff91834e 100644 --- a/userappwithbroker/build.gradle +++ b/userappwithbroker/build.gradle @@ -42,7 +42,7 @@ if (project.hasProperty("buildApplicationId")) { println "Using application Id " + destApplicationId android { - compileSdkVersion rootProject.ext.automationAndTestAppCompileSDK + compileSdkVersion rootProject.ext.compileSdkVersion compileOptions { // Flag to enable support for the new language APIs