Fixes after merge

packages/app/package.json

@@ -9,6 +9,7 @@
     "@backstage/core": "^0.3.0",
     "@backstage/plugin-api-docs": "^0.2.1",
     "@backstage/plugin-catalog": "^0.2.1",
+    "@backstage/plugin-catalog-import": "^0.2.0",
     "@backstage/plugin-circleci": "^0.2.1",
     "@backstage/plugin-cloudbuild": "^0.2.1",
     "@backstage/plugin-cost-insights": "^0.3.0",

plugins/catalog-backend/src/ingestion/types.ts

@@ -20,7 +20,7 @@ import {
   Location,
   LocationSpec,
 } from '@backstage/catalog-model';
-import { RecursivePartial } from './processors/ldap/util';
+import { RecursivePartial } from '../util/RecursivePartial';
 
 //
 // HigherOrderOperation

plugins/catalog-import/package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.2.0",
-    "@backstage/core": "^0.2.0",
+    "@backstage/core": "^0.3.0",
     "@backstage/plugin-catalog": "^0.2.0",
     "@backstage/plugin-catalog-backend": "^0.2.0",
     "@backstage/theme": "^0.2.0",
@@ -40,9 +40,9 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.26",
-    "@backstage/dev-utils": "^0.1.1-alpha.26",
-    "@backstage/test-utils": "^0.1.1-alpha.26",
+    "@backstage/cli": "^0.2.0",
+    "@backstage/dev-utils": "^0.1.0",
+    "@backstage/test-utils": "^0.1.0",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

plugins/catalog-import/src/api/CatalogImportClient.ts

@@ -15,12 +15,7 @@
  */
 
 import { Octokit } from '@octokit/rest';
-import {
-  DiscoveryApi,
-  githubAuthApiRef,
-  OAuthApi,
-  useApi,
-} from '@backstage/core';
+import { DiscoveryApi, OAuthApi } from '@backstage/core';
 import { CatalogImportApi } from './CatalogImportApi';
 import { AnalyzeLocationResponse } from '@backstage/plugin-catalog-backend';
 import { PartialEntity } from '../util/types';