Skip to content

Commit

Permalink
remove deprecated legacy notarize tool
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaietta committed Jun 25, 2024
1 parent 35daaf4 commit 6c93954
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
2 changes: 1 addition & 1 deletion packages/app-builder-lib/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export { Configuration, AfterPackContext, MetadataDirectories } from "./configur
export { ElectronBrandingOptions, ElectronDownloadOptions, ElectronPlatformName } from "./electron/ElectronFramework"
export { PlatformSpecificBuildOptions, AsarOptions, FileSet, Protocol, ReleaseInfo } from "./options/PlatformSpecificBuildOptions"
export { FileAssociation } from "./options/FileAssociation"
export { MacConfiguration, DmgOptions, MasConfiguration, MacOsTargetName, DmgContent, DmgWindow, NotarizeLegacyOptions, NotarizeNotaryOptions } from "./options/macOptions"
export { MacConfiguration, DmgOptions, MasConfiguration, MacOsTargetName, DmgContent, DmgWindow, NotarizeNotaryOptions } from "./options/macOptions"
export { PkgOptions, PkgBackgroundOptions, BackgroundAlignment, BackgroundScaling } from "./options/pkgOptions"
export { WindowsConfiguration } from "./options/winOptions"
export { AppXOptions } from "./options/AppXOptions"
Expand Down
6 changes: 3 additions & 3 deletions packages/app-builder-lib/src/macPackager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import { createCommonTarget, NoOpTarget } from "./targets/targetFactory"
import { isMacOsHighSierra } from "./util/macosVersion"
import { getTemplatePath } from "./util/pathManager"
import * as fs from "fs/promises"
import { notarize, NotarizeOptions } from "@electron/notarize"
import { NotaryToolKeychainCredentials } from "@electron/notarize/lib/types"
import { notarize } from "@electron/notarize"
import { NotarizeOptionsNotaryTool, NotaryToolKeychainCredentials } from "@electron/notarize/lib/types"

export type CustomMacSignOptions = SignOptions
export type CustomMacSign = (configuration: CustomMacSignOptions, packager: MacPackager) => Promise<void>
Expand Down Expand Up @@ -505,7 +505,7 @@ export class MacPackager extends PlatformPackager<MacConfiguration> {
log.info(null, "notarization successful")
}

private getNotarizeOptions(appPath: string): NotarizeOptions | undefined {
private getNotarizeOptions(appPath: string): NotarizeOptionsNotaryTool | undefined {
let teamId = process.env.APPLE_TEAM_ID
const appleId = process.env.APPLE_ID
const appleIdPassword = process.env.APPLE_APP_SPECIFIC_PASSWORD
Expand Down
16 changes: 1 addition & 15 deletions packages/app-builder-lib/src/options/macOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,21 +231,7 @@ export interface MacConfiguration extends PlatformSpecificBuildOptions {
*
* For security reasons it is recommended to use the first option (see https://github.com/electron-userland/electron-builder/issues/7859)
*/
readonly notarize?: NotarizeLegacyOptions | NotarizeNotaryOptions | boolean | null
}

/** @deprecated */
export interface NotarizeLegacyOptions {
/**
* The app bundle identifier your Electron app is using. E.g. com.github.electron. Useful if notarization ID differs from app ID (unlikely).
* Only used by `legacy` notarization tool
*/
readonly appBundleId?: string | null

/**
* Your Team Short Name. Only used by `legacy` notarization tool
*/
readonly ascProvider?: string | null
readonly notarize?: NotarizeNotaryOptions | boolean | null
}

export interface NotarizeNotaryOptions {
Expand Down

0 comments on commit 6c93954

Please sign in to comment.