From 4142544d2b9c97cbbb73535e07cc0a753b6d6bc4 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 26 Jul 2021 13:53:46 -0700 Subject: [PATCH 1/2] Remove mockito dependency as RC3 --- common/versioning/version.properties | 2 +- testutils/build.gradle | 1 - .../microsoft/identity/internal/testutils/TestUtils.java | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/common/versioning/version.properties b/common/versioning/version.properties index d37a9e1d0e..b01e85f2c7 100644 --- a/common/versioning/version.properties +++ b/common/versioning/version.properties @@ -1,4 +1,4 @@ #Tue Apr 06 22:55:08 UTC 2021 -versionName=3.5.0-RC2 +versionName=3.5.0-RC3 versionCode=1 latestPatchVersion=180 diff --git a/testutils/build.gradle b/testutils/build.gradle index 87d38f67f6..3b82c5b14d 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -191,7 +191,6 @@ dependencies { implementation(group: 'com.microsoft.identity', name: 'labapi', version: '0.0.+') } - implementation "org.mockito:mockito-inline:$rootProject.ext.mockitoCoreVersion" implementation "androidx.test:core:$rootProject.ext.androidxTestCoreVersion" implementation "com.google.code.gson:gson:$rootProject.ext.gsonVersion" implementation "com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusVersion" diff --git a/testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java b/testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java index 0e0fa4497f..e40de9081b 100644 --- a/testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java +++ b/testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java @@ -34,8 +34,6 @@ import com.microsoft.identity.common.internal.cache.SharedPreferencesFileManager; import com.microsoft.identity.common.internal.dto.CredentialType; -import org.mockito.Mockito; - import java.util.Map; public class TestUtils { @@ -67,13 +65,6 @@ public static SharedPreferencesFileManager getSharedPreferences(final String sha return SharedPreferencesFileManager.getSharedPreferences(context, sharedPrefName, null); } - public static Activity getMockActivity(final Context context) { - final Activity mockedActivity = Mockito.mock(Activity.class); - Mockito.when(mockedActivity.getApplicationContext()).thenReturn(context); - - return mockedActivity; - } - /** * Return a SharedPreferences instance that works with stores containing encrypted values. * From 5d0d966aa969265b46d673381b19bd3747af2ccf Mon Sep 17 00:00:00 2001 From: AdamBJohnsonx <63813613+AdamBJohnsonx@users.noreply.github.com> Date: Mon, 26 Jul 2021 17:24:49 -0700 Subject: [PATCH 2/2] Update common/versioning/version.properties --- common/versioning/version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/versioning/version.properties b/common/versioning/version.properties index b01e85f2c7..279dd1679c 100644 --- a/common/versioning/version.properties +++ b/common/versioning/version.properties @@ -1,4 +1,4 @@ #Tue Apr 06 22:55:08 UTC 2021 -versionName=3.5.0-RC3 +versionName=3.5.0 versionCode=1 latestPatchVersion=180