Skip to content

fix: update an old Xcode warning as now its applicable for all supported Xcode versions #4069

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
merged 1 commit into from
Oct 29, 2018
Merged

fix: update an old Xcode warning as now its applicable for all supported Xcode versions #4069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f

if (!teamId) {
const teams = await this.$iOSProvisionService.getDevelopmentTeams();
this.$logger.warn("Xcode 8 requires a team id to be specified when building for device.");
this.$logger.warn("Xcode requires a team id to be specified when building for device.");
this.$logger.warn("You can specify the team id by setting the DEVELOPMENT_TEAM setting in build.xcconfig file located in App_Resources folder of your app, or by using the --teamId option when calling run, debug or livesync commands.");
if (teams.length === 1) {
teamId = teams[0].id;
Expand Down
10 changes: 5 additions & 5 deletions test/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function createTestInjector(projectPath: string, projectName: string, xcode?: IX
projectPath: projectPath,
projectFilePath: path.join(projectPath, "package.json"),
projectId: "",
projectIdentifiers: { android: "", ios: ""}
projectIdentifiers: { android: "", ios: "" }
});
testInjector.register("projectData", projectData);
testInjector.register("projectHelper", {});
Expand Down Expand Up @@ -505,15 +505,15 @@ describe("Source code in plugin support", () => {
const mockPrepareMethods = ["prepareFrameworks", "prepareStaticLibs", "prepareResources", "prepareNativeSourceCode"];

mockPrepareMethods.filter(m => m !== prepareMethodToCall).forEach(methodName => {
iOSProjectService[methodName] = (pluginPlatformsFolderPath: string, pluginData: IPluginData): Promise<void> => {
iOSProjectService[methodName] = (pluginPlatformsFolderPath: string, pluginData: IPluginData): Promise<void> => {
return Promise.resolve();
};
});

iOSProjectService.getXcodeprojPath = () => {
return path.join(__dirname, "files");
};
let pbxProj : any;
let pbxProj: any;
iOSProjectService.savePbxProj = (project: any): Promise<void> => {
pbxProj = project;
return Promise.resolve();
Expand Down Expand Up @@ -544,7 +544,7 @@ describe("Source code in plugin support", () => {

it("adds plugin with Source files", async () => {
const sourceFileNames = [
"src/Header.h", "src/ObjC.m",
"src/Header.h", "src/ObjC.m",
"src/nested/Header.hpp", "src/nested/Source.cpp", "src/nested/ObjCpp.mm",
"src/nested/level2/Header2.hxx", "src/nested/level2/Source2.cxx", "src/nested/level2/Source3.c",
"src/SomeOtherExtension.donotadd",
Expand Down Expand Up @@ -949,7 +949,7 @@ describe("Merge Project XCConfig files", () => {

appResourcesXcconfigPath = path.join(projectData.appResourcesDirectoryPath, "iOS", BUILD_XCCONFIG_FILE_NAME);
appResourceXCConfigContent = `CODE_SIGN_IDENTITY = iPhone Distribution
// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// To build for device with XCode you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand Down
4 changes: 2 additions & 2 deletions test/xcconfig-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe("XCConfig Service Tests", () => {
return `// You can add custom settings here
// for example you can uncomment the following line to force distribution code signing
CODE_SIGN_IDENTITY = iPhone Distribution
// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// To build for device with XCode you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;`;
Expand All @@ -80,7 +80,7 @@ describe("XCConfig Service Tests", () => {
return `// You can add custom settings here
// for example you can uncomment the following line to force distribution code signing
CODE_SIGN_IDENTITY = iPhone Distribution
// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// To build for device with XCode you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// DEVELOPMENT_TEAM = YOUR_TEAM_ID
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage`;
Expand Down