Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Breaking Changes

- feat(apple)!: Remove CocoaPods as an installation option ([#1299](https://github.com/getsentry/sentry-wizard/pull/1299))

## 6.13.0

### Fixes
Expand Down
9 changes: 3 additions & 6 deletions src/apple/apple-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import {
printWelcome,
} from '../utils/clack';
import { offerProjectScopedMcpConfig } from '../utils/clack/mcp-config';
import * as Sentry from '@sentry/node';

import { checkInstalledCLI } from './check-installed-cli';
import { configureFastlane } from './configure-fastlane';
import { configurePackageManager } from './configure-package-manager';
import { configureSentryCLI } from './configure-sentry-cli';
import { configureXcodeProject } from './configure-xcode-project';
import { injectCodeSnippet } from './inject-code-snippet';
Expand Down Expand Up @@ -75,17 +76,13 @@ async function runAppleWizardWithTelementry(
authToken: authToken,
});

// Step - Set up Package Manager
const { shouldUseSPM } = await configurePackageManager({
projectDir,
});
Sentry.setTag('package-manager', 'SPM');

// Step - Configure Xcode Project
configureXcodeProject({
xcProject,
project: selectedProject,
target,
shouldUseSPM,
});

// Step - Feature Selection
Expand Down
79 changes: 0 additions & 79 deletions src/apple/configure-package-manager.ts

This file was deleted.

15 changes: 5 additions & 10 deletions src/apple/configure-xcode-project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,20 @@ export function configureXcodeProject({
xcProject,
project,
target,
shouldUseSPM,
}: {
xcProject: XcodeProject;
project: SentryProjectData;
target: string;
shouldUseSPM: boolean;
}) {
traceStep('Update Xcode project', () => {
xcProject.updateXcodeProject(
project,
target,
shouldUseSPM
? {
product: sentrySwiftPackageProductSpec,
existingFrameworkComment:
SENTRY_SPM_ALREADY_LINKED_FRAMEWORK_COMMENT,
successMessage: 'Added Sentry SPM dependency to your project',
}
: undefined,
{
product: sentrySwiftPackageProductSpec,
existingFrameworkComment: SENTRY_SPM_ALREADY_LINKED_FRAMEWORK_COMMENT,
successMessage: 'Added Sentry SPM dependency to your project',
},
true,
);
});
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/react-native/react-native-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as fs from 'fs';

import * as Sentry from '@sentry/node';
import { platform } from 'os';
import { podInstall } from '../apple/cocoapod';
import { podInstall } from './cocoapod';
import { traceStep, withTelemetry } from '../telemetry';
import { offerProjectScopedMcpConfig } from '../utils/clack/mcp-config';
import {
Expand Down
171 changes: 0 additions & 171 deletions test/apple/configure-package-manager.test.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
addCocoaPods,
podInstall,
usesCocoaPod,
} from '../../src/apple/cocoapod';
} from '../../src/react-native/cocoapod';
import * as bash from '../../src/utils/bash';
// @ts-expect-error - clack is ESM and TS complains about that. It works though
import * as clack from '@clack/prompts';
Expand Down
Loading