target and compile sdk to 34

AzureAD · Jul 26, 2023 · 6c26194 · 6c26194
1 parent 695e934
commit 6c26194
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -1,4 +1,4 @@
-Version 4.7.1
+VNext
 -------------
 - [PATCH] Update YubiKit version to 2.3.0 (#1744)
 

diff --git a/common b/common
diff --git 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
@@ -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
@@ -18,7 +18,8 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+10 −2		LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/LabClient.java
+6 −69		azure-pipelines/pull-request-validation/common.yml
+1 −13		changelog.txt
+0 −1		common/src/main/AndroidManifest.xml
+6 −1		common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java
+4 −10		...main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/AccountManagerBrokerDiscoveryUtil.kt
+11 −5		common/src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClient.kt
+55 −2		...n/src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/LegacyBrokerDiscoveryClient.kt
+26 −20		common/src/main/java/com/microsoft/identity/common/internal/broker/AndroidBrokerAccount.java
+42 −26		common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerData.kt
+292 −0		common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerValidator.java
+0 −100		common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerValidator.kt
+0 −44		common/src/main/java/com/microsoft/identity/common/internal/broker/IBrokerValidator.kt
+14 −29		common/src/main/java/com/microsoft/identity/common/internal/broker/PackageHelper.java
+4 −1		common/src/main/java/com/microsoft/identity/common/internal/cache/ActiveBrokerCache.kt
+4 −41		common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+2 −32		common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidPlatformUtil.java
+11 −27		common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java
+7 −15		common/src/main/java/com/microsoft/identity/common/internal/ui/webview/certbasedauth/CertBasedAuthFactory.java
+9 −7		common/src/main/java/com/microsoft/identity/common/internal/util/PackageUtils.java
+2 −1		common/src/main/java/com/microsoft/identity/common/internal/util/ProcessUtil.java
+0 −102		common/src/test/java/com/microsoft/identity/common/internal/AccountManagerBrokerDiscoveryUtilTests.kt
+0 −103		common/src/test/java/com/microsoft/identity/common/internal/BrokerValidatorTest.kt
+128 −0		common/src/test/java/com/microsoft/identity/common/internal/BrokerValidatorTests.java
+6 −6		...on/src/test/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClientTests.kt
+10 −12		common/src/test/java/com/microsoft/identity/common/internal/broker/AndroidBrokerAccountTest.java
+0 −82		common/src/test/java/com/microsoft/identity/common/internal/broker/BrokerDataTest.kt
+0 −15		...src/test/java/com/microsoft/identity/common/internal/ui/webview/certbasedauth/CertBasedAuthFactoryTest.java
+1 −3		common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
+9 −3		common4j/src/test/com/microsoft/identity/common/java/net/UrlConnectionHttpClientTest.java
+1 −1		common4j/versioning/version.properties
+2 −2		gradle/versions.gradle
+0 −3		uiautomationutilities/build.gradle
+2 −0		...tomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/BrokerCompanyPortal.java
+12 −26		...ain/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java
+1 −2		uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RulesHelper.java
+2 −2		uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/CommonUtils.java
+0 −36		uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/UiAutomatorUtils.java
+1 −1		versioning/version.properties