Skip to content

Commit a2a235c

Browse files
committed
chore: remove IDeploymentTarget interface
1 parent 5574fc5 commit a2a235c

File tree

4 files changed

+6
-26
lines changed

4 files changed

+6
-26
lines changed

lib/definitions/project.d.ts

+1-16
Original file line numberDiff line numberDiff line change
@@ -449,22 +449,7 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
449449
* Get the deployment target's version
450450
* Currently implemented only for iOS -> returns the value of IPHONEOS_DEPLOYMENT_TARGET property from xcconfig file
451451
*/
452-
getDeploymentTarget(projectData: IProjectData): IDeploymentTargetData;
453-
}
454-
455-
interface IDeploymentTargetData {
456-
/**
457-
* The whole version's value
458-
*/
459-
version: string;
460-
/**
461-
* The major's version
462-
*/
463-
majorVersion: number;
464-
/**
465-
* The minor's version
466-
*/
467-
minorVersion: number;
452+
getDeploymentTarget(projectData: IProjectData): any;
468453
}
469454

470455
interface IValidatePlatformOutput {

lib/services/android-project-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
665665
// Nothing android specific to check yet.
666666
}
667667

668-
public getDeploymentTarget(projectData: IProjectData): IDeploymentTargetData { return; }
668+
public getDeploymentTarget(projectData: IProjectData): semver.SemVer { return; }
669669

670670
private copy(projectRoot: string, frameworkDir: string, files: string, cpArg: string): void {
671671
const paths = files.split(' ').map(p => path.join(frameworkDir, p));

lib/services/ios-project-service.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
454454
const frameworkVersion = this.getFrameworkVersion(projectData);
455455
if (semver.valid(frameworkVersion) && semver.validRange(frameworkVersion) && semver.lt(semver.coerce(frameworkVersion), "5.1.0")) {
456456
const target = this.getDeploymentTarget(projectData);
457-
if (target && target.majorVersion >= 11) {
457+
if (target && target.major >= 11) {
458458
// We need to strip 32bit architectures as of deployment target >= 11 it is not allowed to have such
459459
architectures = _.filter(architectures, arch => {
460460
const is64BitArchitecture = arch === "x86_64" || arch === "arm64";
@@ -1045,18 +1045,13 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
10451045
return [];
10461046
}
10471047

1048-
public getDeploymentTarget(projectData: IProjectData): IDeploymentTargetData {
1048+
public getDeploymentTarget(projectData: IProjectData): semver.SemVer {
10491049
const target = this.$xCConfigService.readPropertyValue(this.getBuildXCConfigFilePath(projectData), "IPHONEOS_DEPLOYMENT_TARGET");
10501050
if (!target) {
10511051
return null;
10521052
}
10531053

1054-
const parts = target.split(".");
1055-
return {
1056-
version: target,
1057-
majorVersion: parseInt(parts[0]),
1058-
minorVersion: parseInt(parts[1])
1059-
};
1054+
return semver.coerce(target);
10601055
}
10611056

10621057
private getAllLibsForPluginWithFileExtension(pluginData: IPluginData, fileExtension: string): string[] {

test/stubs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor
467467
getPluginPlatformsFolderPath(pluginData: IPluginData, platform: string): string {
468468
return "";
469469
}
470-
getDeploymentTarget(projectData: IProjectData): IDeploymentTargetData {
470+
getDeploymentTarget(projectData: IProjectData): any {
471471
return;
472472
}
473473
}

0 commit comments

Comments
 (0)