From eb422ee1bf2c888ee68aca0ea94e4b8e83ddc3ea Mon Sep 17 00:00:00 2001
From: Marek Calus <marek-calus@wp.pl>
Date: Thu, 19 Nov 2020 15:35:25 +0100
Subject: [PATCH] Fixes after merge

---
 packages/app/package.json                             | 1 +
 plugins/catalog-backend/src/ingestion/types.ts        | 2 +-
 plugins/catalog-import/package.json                   | 8 ++++----
 plugins/catalog-import/src/api/CatalogImportClient.ts | 7 +------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index de6b61684a..6d31adfa65 100644
--- a/packages/app/package.json
+++ b/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",
diff --git a/plugins/catalog-backend/src/ingestion/types.ts b/plugins/catalog-backend/src/ingestion/types.ts
index 29308fdd92..79a5387247 100644
--- a/plugins/catalog-backend/src/ingestion/types.ts
+++ b/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
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index ee157235ca..4666e22f10 100644
--- a/plugins/catalog-import/package.json
+++ b/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",
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts
index f8b4e5d17e..94ba260d55 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.ts
+++ b/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';