Update to TargetSdk 35, Fixes AB#3291158 (#2713)

[AB#3291158](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3291158)

Bump
- TargetSdk/CompileSdk/buildTools to 35
- minSdk to 24
- AGP to 8.10.0
- Kotlin, Mockito, lombok, Robolectric (to the compatible versions)
- JVM to 1.8

Removed desugaring and migrated test code away from new Java API. 
This is because AGP 8.6+ added a compile time check, and we don't want
to force our consuming app to desugar (which will increase APK size)

already validated with weekly/monthly pipeline.

Author: rpdome

LabApiUtilities/build.gradle

@@ -115,3 +115,6 @@ publishing {
         }
     }
 }
+
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"

changelog.txt

@@ -1,5 +1,6 @@
 vNext
 ----------
+- [MAJOR] Bump TargetSdk to 35, minSdk to 24, AGP to 8.10.0 (#2713)
 - [Minor] Improve tenant-based flighting for broker supporting code (#2717)
 - [PATCH] Fix caching of secret key and add retries for InvalidKeyException during unwrap (#2659)
 - [MINOR] Replace AbstractSecretKeyLoader with ISecretKeyProvider (#2666)

common/build.gradle

@@ -9,14 +9,8 @@ plugins {
 
 apply from: '../versioning/version_tasks.gradle'
 
-def desugarCode = false
-
-if (project.hasProperty("sugar")) {
-    desugarCode = sugar.toBoolean()
-}
-
 buildSystem {
-    desugar = desugarCode
+    desugar = false
 }
 
 def enableCodeCoverage = false
@@ -84,6 +78,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     lintOptions {
         abortOnError true
         disable 'MissingPermission'
@@ -139,8 +137,6 @@ android {
 
 dependencies {
     testImplementation project(path: ':testutils')
-    //Java 8 - Desugaring - Enabled/Disabled via plugin
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion"
 
     localApi(project(":common4j")) {
         transitive = false
@@ -196,7 +192,6 @@ dependencies {
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
     testImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoCoreVersion"
     testImplementation "org.mockito.kotlin:mockito-kotlin:$rootProject.ext.mockitoKotlinVersion"
-    testImplementation "org.mockito:mockito-inline:$rootProject.ext.mockitoCoreVersion"
     testImplementation "io.mockk:mockk:1.11.0"
 
     testImplementation "org.powermock:powermock-module-junit4:$rootProject.ext.powerMockVersion"

common/src/androidTest/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyProviderTest.java

@@ -222,7 +222,7 @@ public void testPerf_WithCachedKey() throws ClientException {
 
     // 23s With Google Pixel XL, OS Version 29 (100 loop)
     @Test
-    @Ignore
+    @Ignore("Performance test, ignore in normal test run")
     public void testPerf_NoCachedKey() throws ClientException {
         final AndroidWrappedKeyProvider keyProvider = new AndroidWrappedKeyProvider(MOCK_KEY_ALIAS, MOCK_KEY_FILE_PATH, context);
 

common/src/androidTest/java/com/microsoft/identity/common/internal/platform/AndroidDevicePoPManagerTests.java

@@ -23,18 +23,13 @@
 package com.microsoft.identity.common.internal.platform;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.Base64;
 
-import androidx.annotation.RequiresApi;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.microsoft.identity.common.java.exception.ClientException;
 import com.microsoft.identity.common.java.crypto.IDevicePopManager;
 import com.google.gson.reflect.TypeToken;
@@ -457,7 +452,6 @@ public void testGenerateShr() throws ClientException, MalformedURLException, Par
     }
 
     @Test
-    @RequiresApi(Build.VERSION_CODES.N)
     public void testHasCertificateChain24() throws ClientException {
         Assert.assertFalse(mDevicePopManager.asymmetricKeyExists());
         mDevicePopManager.generateAsymmetricKey();
@@ -474,7 +468,6 @@ public void testHasCertificateChain24() throws ClientException {
     }
 
     @Test
-    @RequiresApi(Build.VERSION_CODES.N)
     public void testNullWhenQueryingNonexistentChain24() throws ClientException {
         Assert.assertFalse(mDevicePopManager.asymmetricKeyExists());
         // Returns null for nonexistent key

common/src/main/java/com/microsoft/identity/common/adal/internal/ADALError.java

@@ -23,6 +23,7 @@
 
 package com.microsoft.identity.common.adal.internal;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -676,6 +677,7 @@ public String getDescription() {
      * @param context {@link Context}
      * @return Error description
      */
+    @SuppressLint("DiscouragedApi")
     public String getLocalizedDescription(Context context) {
         // Optional overwrite to error descriptions from resource files.
         // Application can repeat the resource entries from libraries.
@@ -684,7 +686,6 @@ public String getLocalizedDescription(Context context) {
         // order.
         if (context != null) {
             Configuration conf = context.getResources().getConfiguration();
-            @SuppressWarnings("deprecation")
             Resources resources = new Resources(context.getAssets(), context.getResources()
                     .getDisplayMetrics(), conf);
             return resources.getString(resources.getIdentifier(this.name(), "string",

common/src/main/java/com/microsoft/identity/common/adal/internal/PowerManagerWrapper.java

@@ -22,12 +22,12 @@
 // THE SOFTWARE.
 package com.microsoft.identity.common.adal.internal;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.os.PowerManager;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 /**
  * Wrapper class for PowerManager.
@@ -65,7 +65,7 @@ public static synchronized PowerManagerWrapper getInstance() {
      * @param connectionContext Context used to query if app is in idle mode.
      * @return true if the device is in doze/idle mode.
      */
-    @TargetApi(Build.VERSION_CODES.M)
+    @RequiresApi(Build.VERSION_CODES.M)
     public boolean isDeviceIdleMode(final Context connectionContext) {
         return ((PowerManager) connectionContext.getSystemService(Context.POWER_SERVICE)).isDeviceIdleMode();
     }
@@ -130,7 +130,7 @@ public String getPowerOptimizationSettings(@NonNull final Context context){
      * @param connectionContext Context used to query if app is ignoring battery optimizations.
      * @return true if the given application package name is on the device's power allow list.
      */
-    @TargetApi(Build.VERSION_CODES.M)
+    @RequiresApi(Build.VERSION_CODES.M)
     public boolean isIgnoringBatteryOptimizations(final Context connectionContext) {
         return ((PowerManager) connectionContext.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(connectionContext.getPackageName());
     }

common/src/main/java/com/microsoft/identity/common/adal/internal/UsageStatsManagerWrapper.java

@@ -22,11 +22,12 @@
 // THE SOFTWARE.
 package com.microsoft.identity.common.adal.internal;
 
-import android.annotation.TargetApi;
 import android.app.usage.UsageStatsManager;
 import android.content.Context;
 import android.os.Build;
 
+import androidx.annotation.RequiresApi;
+
 /**
  * Wrapper class for UsageStatsManager.
  */
@@ -62,7 +63,7 @@ public static synchronized UsageStatsManagerWrapper getInstance() {
      * @param connectionContext Context used to query app active state.
      * @return true if the app is inactive.
      */
-    @TargetApi(Build.VERSION_CODES.M)
+    @RequiresApi(Build.VERSION_CODES.M)
     public boolean isAppInactive(final Context connectionContext) {
         return ((UsageStatsManager) connectionContext.getSystemService(Context.USAGE_STATS_SERVICE)).isAppInactive(connectionContext.getPackageName());
     }

common/src/main/java/com/microsoft/identity/common/adal/internal/net/DefaultConnectionService.java

@@ -22,7 +22,6 @@
 // THE SOFTWARE.
 package com.microsoft.identity.common.adal.internal.net;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkCapabilities;
@@ -107,7 +106,6 @@ public boolean isConnectionAvailable() {
      * @return true if the device is API23 and one or both of the following is true: the device is in doze or the company
      * portal is in standby, false otherwise.
      */
-    @TargetApi(Build.VERSION_CODES.M)
     public boolean isNetworkDisabledFromOptimizations() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             final PowerManagerWrapper powerManagerWrapper = PowerManagerWrapper.getInstance();

common/src/main/java/com/microsoft/identity/common/internal/broker/SDMBroadcastReceiver.java

@@ -24,6 +24,7 @@
 
 import static com.microsoft.identity.common.java.cache.SharedPreferencesAccountCredentialCache.DEFAULT_ACCOUNT_CREDENTIAL_SHARED_PREFERENCES;
 
+import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -58,8 +59,9 @@ public class SDMBroadcastReceiver {
      * @param context application context.
      * @param sharedDeviceModeCallback a callback to be called when SDM broadcast is received.
      */
-    synchronized public static void initialize( @NonNull final Context context,
-                                   @NonNull final SharedDeviceModeCallback sharedDeviceModeCallback) {
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+    synchronized public static void initialize(@NonNull final Context context,
+                                               @NonNull final SharedDeviceModeCallback sharedDeviceModeCallback) {
         if (sSDMBroadcastReceiver == null) {
             sSDMBroadcastReceiver = new BroadcastReceiver() {
                 @Override
@@ -69,7 +71,7 @@ public void onReceive(final Context context, final Intent intent) {
             };
 
             final IntentFilter filter = new IntentFilter(SharedDeviceModeConstants.CURRENT_ACCOUNT_CHANGED_BROADCAST_IDENTIFIER);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 context.registerReceiver(sSDMBroadcastReceiver, filter, Context.RECEIVER_EXPORTED);
             } else {
                 context.registerReceiver(sSDMBroadcastReceiver, filter);