mirror of
https://github.com/expo/eas-cli.git
synced 2026-11-13 20:28:08 -10:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4fdff4829e |
No files matched your search
@@ -73,8 +73,10 @@ This means that it will most likely produce an AAB and you will not be able to i
|
||||
ctx.projectDir,
|
||||
ctx.exp,
|
||||
ctx.vcsClient,
|
||||
gradleContext
|
||||
gradleContext,
|
||||
buildProfile
|
||||
);
|
||||
|
||||
const versionCodeOverride =
|
||||
ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
|
||||
? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
|
||||
|
||||
@@ -238,9 +238,11 @@ export default class FingerprintCompare extends EasCommand {
|
||||
|
||||
const project = await AppQuery.byIdAsync(graphqlClient, projectId);
|
||||
const fingerprintCompareUrl = new URL(
|
||||
`/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/compare/${firstFingerprintInfo.fingerprint.hash}/${secondFingerprintInfo.fingerprint.hash}`,
|
||||
`/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/compare`,
|
||||
getExpoWebsiteBaseUrl()
|
||||
);
|
||||
fingerprintCompareUrl.searchParams.set('a', firstFingerprintInfo.fingerprint.hash);
|
||||
fingerprintCompareUrl.searchParams.set('b', secondFingerprintInfo.fingerprint.hash);
|
||||
|
||||
if (!open) {
|
||||
Log.newLine();
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { ExpoConfig, getConfigFilePaths } from '@expo/config';
|
||||
import { AndroidConfig, IOSConfig } from '@expo/config-plugins';
|
||||
import { Platform, Workflow } from '@expo/eas-build-job';
|
||||
import { BuildProfile } from '@expo/eas-json';
|
||||
import assert from 'assert';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'fs-extra';
|
||||
@@ -29,6 +30,7 @@ export async function ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||
exp,
|
||||
vcsClient,
|
||||
nonInteractive,
|
||||
buildProfile,
|
||||
}: {
|
||||
graphqlClient: ExpoGraphqlClient;
|
||||
projectDir: string;
|
||||
@@ -36,14 +38,21 @@ export async function ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||
exp: ExpoConfig;
|
||||
vcsClient: Client;
|
||||
nonInteractive: boolean;
|
||||
buildProfile: BuildProfile<Platform.ANDROID>;
|
||||
}): Promise<string> {
|
||||
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
|
||||
assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
|
||||
|
||||
try {
|
||||
return await getApplicationIdAsync(projectDir, exp, vcsClient, {
|
||||
moduleName: gradleUtils.DEFAULT_MODULE_NAME,
|
||||
});
|
||||
return await getApplicationIdAsync(
|
||||
projectDir,
|
||||
exp,
|
||||
vcsClient,
|
||||
{
|
||||
moduleName: gradleUtils.DEFAULT_MODULE_NAME,
|
||||
},
|
||||
buildProfile
|
||||
);
|
||||
} catch {
|
||||
return await configureApplicationIdAsync({
|
||||
graphqlClient,
|
||||
@@ -104,12 +113,17 @@ export async function getApplicationIdAsync(
|
||||
projectDir: string,
|
||||
exp: ExpoConfig,
|
||||
vcsClient: Client,
|
||||
gradleContext?: GradleBuildContext
|
||||
gradleContext?: GradleBuildContext,
|
||||
buildProfile?: BuildProfile<Platform.ANDROID>
|
||||
): Promise<string> {
|
||||
if (env.overrideAndroidApplicationId) {
|
||||
return env.overrideAndroidApplicationId;
|
||||
}
|
||||
|
||||
if (buildProfile?.dangerouslyOverrideApplicationId) {
|
||||
return buildProfile.dangerouslyOverrideApplicationId;
|
||||
}
|
||||
|
||||
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
|
||||
if (workflow === Workflow.GENERIC) {
|
||||
warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
|
||||
|
||||
@@ -50,6 +50,7 @@ export async function getApplicationIdentifierAsync({
|
||||
exp,
|
||||
vcsClient,
|
||||
nonInteractive,
|
||||
buildProfile: profile,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -334,6 +334,10 @@
|
||||
"markdownDescription": "[DEPRECATED] Use `applicationArchivePath` instead. Path (or pattern) where EAS Build is going to look for the build artifacts. EAS Build uses the `fast-glob` npm package for pattern matching ([see their README to learn more about the syntax you can use](https://github.com/mrmlnc/fast-glob#pattern-syntax)).",
|
||||
"default": "android/app/build/outputs/**/*.{apk,aab}"
|
||||
},
|
||||
"dangerouslyOverrideApplicationId": {
|
||||
"type": "string",
|
||||
"description": "If EAS CLI is unable to detect your application ID (such as when using multiple product flavors), you can use this field to specify it manually."
|
||||
},
|
||||
"config": {
|
||||
"description": "Custom workflow file name that will be used to run this Android build. You can also specify this property on profile levle for platform-agnostic workflows. Learn more: https://docs.expo.dev/custom-builds/get-started/",
|
||||
"type": "string"
|
||||
|
||||
@@ -102,6 +102,8 @@ const AndroidBuildProfileSchema = PlatformBuildProfileSchema.concat(
|
||||
Joi.string().valid('version', 'versionCode')
|
||||
),
|
||||
|
||||
dangerouslyOverrideApplicationId: Joi.string(),
|
||||
|
||||
keystoreName: Joi.when('credentialsSource', {
|
||||
is: 'remote',
|
||||
then: Joi.string(),
|
||||
|
||||
@@ -94,6 +94,8 @@ export interface AndroidBuildProfile extends PlatformBuildProfile {
|
||||
// versions
|
||||
autoIncrement?: AndroidVersionAutoIncrement;
|
||||
|
||||
dangerouslyOverrideApplicationId?: string;
|
||||
|
||||
keystoreName?: string;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user