From b4ee5f9ec55e45dc95c4cd5ddc2150abaf7b809f Mon Sep 17 00:00:00 2001 From: DimitarTachev Date: Fri, 26 Oct 2018 17:31:50 +0300 Subject: [PATCH] fix: update an old Xcode warning as now its applicable for all supported Xcode versions --- lib/services/ios-project-service.ts | 2 +- test/ios-project-service.ts | 10 +++++----- test/xcconfig-service.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index 655b3dabea..5054ef5ae1 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -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; diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts index 1d538e3439..ac4c60a342 100644 --- a/test/ios-project-service.ts +++ b/test/ios-project-service.ts @@ -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", {}); @@ -505,7 +505,7 @@ 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 => { + iOSProjectService[methodName] = (pluginPlatformsFolderPath: string, pluginData: IPluginData): Promise => { return Promise.resolve(); }; }); @@ -513,7 +513,7 @@ describe("Source code in plugin support", () => { iOSProjectService.getXcodeprojPath = () => { return path.join(__dirname, "files"); }; - let pbxProj : any; + let pbxProj: any; iOSProjectService.savePbxProj = (project: any): Promise => { pbxProj = project; return Promise.resolve(); @@ -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", @@ -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; diff --git a/test/xcconfig-service.ts b/test/xcconfig-service.ts index 9a96daecf8..c60c5998e4 100644 --- a/test/xcconfig-service.ts +++ b/test/xcconfig-service.ts @@ -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;`; @@ -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`;