fix: Update package names for new version of client lib

Author: sqrrrl

adminSDK/directory/quickstart/src/main/java/AdminSDKDirectoryQuickstart.java

@@ -24,10 +24,10 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.store.FileDataStoreFactory;
-import com.google.api.services.admin.directory.Directory;
-import com.google.api.services.admin.directory.DirectoryScopes;
-import com.google.api.services.admin.directory.model.User;
-import com.google.api.services.admin.directory.model.Users;
+import com.google.api.services.directory.Directory;
+import com.google.api.services.directory.DirectoryScopes;
+import com.google.api.services.directory.model.User;
+import com.google.api.services.directory.model.Users;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;

adminSDK/reports/quickstart/src/main/java/AdminSDKReportsQuickstart.java

@@ -25,10 +25,10 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.store.FileDataStoreFactory;
-import com.google.api.services.admin.reports.Reports;
-import com.google.api.services.admin.reports.ReportsScopes;
-import com.google.api.services.admin.reports.model.Activities;
-import com.google.api.services.admin.reports.model.Activity;
+import com.google.api.services.reports.Reports;
+import com.google.api.services.reports.ReportsScopes;
+import com.google.api.services.reports.model.Activities;
+import com.google.api.services.reports.model.Activity;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;

drive/snippets/drive_v2/build.gradle

@@ -5,7 +5,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.apis:google-api-services-drive:v3-rev20220815-2.0.0'
+    implementation 'com.google.apis:google-api-services-drive:v2-rev20220815-2.0.0'
     implementation 'com.google.api-client:google-api-client:1.23.0'
     implementation 'com.google.auth:google-auth-library-oauth2-http:1.10.0'
     implementation 'com.google.oauth-client:google-oauth-client-jetty:1.34.1'

gmail/snippets/src/test/java/TestCreateSmimeInfo.java

@@ -17,6 +17,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
 
 import com.google.api.services.gmail.model.SmimeInfo;
 import org.junit.Test;

vault/vault-hold-migration-api/src/main/java/com/google/vault/chatmigration/DirectoryService.java

@@ -17,10 +17,10 @@
 package com.google.vault.chatmigration;
 
 import com.github.rholder.retry.RetryException;
-import com.google.api.services.admin.directory.Directory;
-import com.google.api.services.admin.directory.model.OrgUnit;
-import com.google.api.services.admin.directory.model.OrgUnits;
-import com.google.api.services.admin.directory.model.User;
+import com.google.api.services.directory.Directory;
+import com.google.api.services.directory.model.OrgUnit;
+import com.google.api.services.directory.model.OrgUnits;
+import com.google.api.services.directory.model.User;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

vault/vault-hold-migration-api/src/main/java/com/google/vault/chatmigration/HoldsReport.java

@@ -16,7 +16,7 @@
 
 package com.google.vault.chatmigration;
 
-import com.google.api.services.admin.directory.model.OrgUnit;
+import com.google.api.services.directory.model.OrgUnit;
 import com.google.api.services.vault.v1.Vault;
 import com.google.api.services.vault.v1.model.Hold;
 import com.google.api.services.vault.v1.model.ListHoldsResponse;

vault/vault-hold-migration-api/src/main/java/com/google/vault/chatmigration/MigrationHelper.java

@@ -26,8 +26,8 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.store.FileDataStoreFactory;
-import com.google.api.services.admin.directory.Directory;
-import com.google.api.services.admin.directory.DirectoryScopes;
+import com.google.api.services.directory.Directory;
+import com.google.api.services.directory.DirectoryScopes;
 import com.google.api.services.vault.v1.Vault;
 import com.google.api.services.vault.v1.VaultScopes;
 import java.io.IOException;

vault/vault-hold-migration-api/src/main/java/com/google/vault/chatmigration/QuickStart.java

@@ -16,7 +16,7 @@
 
 package com.google.vault.chatmigration;
 
-import com.google.api.services.admin.directory.Directory;
+import com.google.api.services.directory.Directory;
 import com.google.api.services.vault.v1.Vault;
 import com.google.vault.chatmigration.MigrationHelper.MigrationOptions;
 import java.io.File;