Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set target sdk and compile sdk to34 #1747

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Set target sdk and compile sdk to34 #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e26168d
Merging somalaya/release/4.7.1 to release/4.7.1 (#1736)
somalaya Jun 9, 2023
72652d2
Merge branch 'dev' of https://github.com/AzureAD/azure-activedirector…
somalaya Jun 28, 2023
d30db63
Merge branch 'dev' of https://github.com/AzureAD/azure-activedirector…
somalaya Jul 11, 2023
695e934
Merge branch 'dev' of https://github.com/AzureAD/azure-activedirector…
somalaya Jul 21, 2023
811c320
Merge branch 'dev' of https://github.com/AzureAD/azure-activedirector…
somalaya Aug 4, 2023
2928de1
target and compile sdk to 34
somalaya Jul 26, 2023
7923fc6
updated changelog
somalaya Jul 26, 2023
21ca27f
Increased AGP to 7.4.2 and gradle dist url to 7.5
somalaya Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion adal/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------
Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 19 files
+6 −1 azure-pipelines/pull-request-validation/build-consumers.yml
+5 −1 changelog.txt
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClient.kt
+10 −34 common/src/main/java/com/microsoft/identity/common/internal/cache/BaseActiveBrokerCache.kt
+5 −6 common/src/main/java/com/microsoft/identity/common/internal/cache/ClientActiveBrokerCache.kt
+12 −0 common/src/main/java/com/microsoft/identity/common/internal/cache/SharedPreferencesFileManager.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+17 −83 common/src/test/java/com/microsoft/identity/common/internal/cache/ActiveBrokerCacheTest.kt
+72 −0 common/src/test/java/com/microsoft/identity/common/internal/cache/ClientActiveBrokerCacheTest.kt
+378 −0 common4j/src/main/com/microsoft/identity/common/java/cache/BrokerOAuth2TokenCacheTelemetryWrapper.java
+101 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+8 −0 common4j/src/main/com/microsoft/identity/common/java/providers/oauth2/OAuth2Strategy.java
+38 −0 ...utilities/src/main/java/com/microsoft/identity/client/ui/automation/annotations/FailsWithDailyVersions.java
+1 −0 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/constants/GlobalConstants.java
+11 −0 ...tilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/PromptHandlerParameters.java
+7 −1 ...ain/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java
+5 −0 ...om/microsoft/identity/client/ui/automation/interaction/microsoftsts/IMicrosoftStsLoginComponentHandler.java
+11 −0 ...in/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/MicrosoftStsPromptHandler.java
+1 −1 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/LoadLabUserTestRule.java
8 changes: 4 additions & 4 deletions gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ ext {
minSdkVersion = 16
brokerProjectMinSdkVersion = 24
automationAppMinSDKVersion = 21
targetSdkVersion = 30
compileSdkVersion = 30
targetSdkVersion = 34
compileSdkVersion = 34
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'
Expand Down Expand Up @@ -68,7 +68,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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion userappwithbroker/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
Loading