Skip to content

fix: building for MacAppStore #1173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ewanharris merged 3 commits into from
Sep 2, 2023
Merged

fix: building for MacAppStore #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a78930f
fix: building for MacAppStore
mbender74 Sep 1, 2023
b0fd1b9
refactor: use macOS pretty target name
ewanharris Sep 2, 2023
2666aa8
fix: corrrect targetForName
ewanharris Sep 2, 2023
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
2 changes: 1 addition & 1 deletion src/quickpicks/build/ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export async function selectiOSProvisioningProfile (certificate: IosCert, target
let deployment: IosProvisioningType = 'development';
if (target === 'dist-adhoc') {
deployment = 'distribution';
} else if (target === 'dist-appstore') {
} else if (target === 'dist-appstore' || target === 'dist-macappstore') {
deployment = 'appstore';
}
const profiles = ExtensionContainer.environment.iOSProvisioningProfiles(deployment, certificate, appId);
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/helpers/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export abstract class TaskHelper {

const options = [ defaultLabel, 'Browse' ];

if ((definition as AppPackageTaskTitaniumBuildBase).target === 'dist-appstore') {
if ((definition as AppPackageTaskTitaniumBuildBase).target === 'dist-appstore' || (definition as AppPackageTaskTitaniumBuildBase).target === 'dist-macappstore') {
options.push('Output Into Xcode');
}

Expand Down
6 changes: 5 additions & 1 deletion src/test/unit/suite/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,27 @@ describe('utils', () => {
expect(utils.nameForTarget('device')).to.equal('Device');
expect(utils.nameForTarget('emulator')).to.equal('Emulator');
expect(utils.nameForTarget('simulator')).to.equal('Simulator');
expect(utils.nameForTarget('macos')).to.equal('macOS');
expect(utils.nameForTarget('dist-adhoc')).to.equal('Ad-Hoc');
expect(utils.nameForTarget('dist-appstore')).to.equal('App Store');
expect(utils.nameForTarget('dist-playstore')).to.equal('Play Store');
expect(utils.nameForTarget('dist-macappstore')).to.equal('macOS App Store');
});

it('targetForName', () => {
expect(utils.targetForName('Device')).to.equal('device');
expect(utils.targetForName('Emulator')).to.equal('emulator');
expect(utils.targetForName('Simulator')).to.equal('simulator');
expect(utils.targetForName('macOS')).to.equal('macos');
expect(utils.targetForName('Ad-Hoc')).to.equal('dist-adhoc');
expect(utils.targetForName('App Store')).to.equal('dist-appstore');
expect(utils.targetForName('Play Store')).to.equal('dist-playstore');
expect(utils.targetForName('macOS App Store')).to.equal('dist-macappstore');
});

it('targetsForPlatform', () => {
expect(utils.targetsForPlatform('android')).to.deep.equal([ 'emulator', 'device', 'dist-playstore' ]);
expect(utils.targetsForPlatform('ios')).to.deep.equal([ 'simulator', 'device', 'dist-adhoc', 'dist-appstore' ]);
expect(utils.targetsForPlatform('ios')).to.deep.equal([ 'simulator', 'device', 'macos', 'dist-adhoc', 'dist-appstore', 'dist-macappstore' ]);
});

it('should be able to retrieve a device name', () => {
Expand Down
8 changes: 7 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,14 @@ export function nameForTarget (target: Target): PrettyTarget {
case 'emulator':
case 'simulator':
return capitalizeFirstLetter(target) as PrettyDevelopmentTarget;
case 'macos':
return 'macOS';
case 'dist-adhoc':
return 'Ad-Hoc';
case 'dist-appstore':
return 'App Store';
case 'dist-macappstore':
return 'macOS App Store';
case 'dist-playstore':
return 'Play Store';
default:
Expand All @@ -107,6 +111,8 @@ export function targetForName (name: PrettyTarget): Target {
return 'dist-appstore';
case 'play store':
return 'dist-playstore';
case 'macos app store':
return 'dist-macappstore';
case 'device':
case 'emulator':
case 'simulator':
Expand All @@ -121,7 +127,7 @@ export function targetsForPlatform (platformName: Platform): Target[] {
case 'android':
return [ 'emulator', 'device', 'dist-playstore' ];
case 'ios':
return [ 'simulator', 'device', 'dist-adhoc', 'dist-appstore' ];
return [ 'simulator', 'device', 'macos', 'dist-adhoc', 'dist-appstore', 'dist-macappstore' ];
default:
return [];
}
Expand Down