Skip to content
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.

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

[TIMOB-19311] Added support for teams and app groups #7017

Merged
merged 4 commits into from
Aug 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
245 changes: 185 additions & 60 deletions iphone/cli/commands/_build.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions iphone/cli/lib/info.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@ exports.render = function (logger, config, rpad, styleHeading, styleValue, style
}

logger.log(' ' + rpad(' ' + __('Supported by TiSDK %s', data.tisdk)) + ' = ' + styleValue(x.supported == 'maybe' ? 'maybe' : x.supported ? 'yes' : 'no'));

if (Object.keys(x.teams).length) {
Object.keys(x.teams).forEach(function (id, i) {
if (i === 0) {
logger.log(' ' + rpad(' ' + __('Teams')) + ' = ' + styleValue(id) + ' ' + x.teams[id].name + ' - ' + x.teams[id].type + (' (' + x.teams[id].status + ')').grey);
} else {
logger.log(' ' + rpad(' ') + ' = ' + styleValue(id) + ' ' + x.teams[id].name + ' - ' + x.teams[id].type + (' (' + x.teams[id].status + ')').grey);
}
});
} else {
logger.log(' ' + rpad(' ' + __('Teams')) + ' = ' + styleValue(__('none')));
}
});
logger.log();
} else {
Expand Down
6 changes: 6 additions & 0 deletions iphone/iphone/Titanium.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
</dict>
</plist>
10 changes: 6 additions & 4 deletions iphone/iphone/Titanium.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@
5081CEF715F8100E00C881D8 /* TiExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TiExceptionHandler.m; sourceTree = "<group>"; };
83924E861B4C3FA200C3F3E8 /* TiAppiOSUserActivityProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiAppiOSUserActivityProxy.h; sourceTree = "<group>"; };
83924E871B4C3FA200C3F3E8 /* TiAppiOSUserActivityProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TiAppiOSUserActivityProxy.m; sourceTree = "<group>"; };
83DCEC301B7A687900F282B3 /* Titanium.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Titanium.entitlements; sourceTree = "<group>"; };
841CCAD01807395C00C8DB76 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
843FA58217BD4DFF0064E061 /* TiUIiOSNavWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiUIiOSNavWindow.h; sourceTree = "<group>"; };
843FA58317BD4DFF0064E061 /* TiUIiOSNavWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TiUIiOSNavWindow.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1989,10 +1990,8 @@
32CA4F630368D1EE00C91783 /* Titanium_Prefix.pch */,
29B97316FDCFA39411CA2CEA /* main.m */,
241EAA21118AB3BB0081A5BE /* defines.h */,
241EAEC5118E2BA90081A5BE /* project.xcconfig */,
24596691118E70D300519F79 /* ApplicationRouting.h */,
24596692118E70D300519F79 /* ApplicationRouting.m */,
2464F96211AB996C001C035A /* module.xcconfig */,
2478B2A311C447A4005814DF /* ApplicationMods.h */,
2478B2A411C447A4005814DF /* ApplicationMods.m */,
2B1F65751431031E006C5D37 /* ApplicationDefaults.h */,
Expand All @@ -2004,6 +2003,9 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
241EAEC5118E2BA90081A5BE /* project.xcconfig */,
2464F96211AB996C001C035A /* module.xcconfig */,
83DCEC301B7A687900F282B3 /* Titanium.entitlements */,
24CA916411116F870084E2DE /* Titanium.plist */,
);
name = Resources;
Expand Down Expand Up @@ -2676,7 +2678,7 @@
baseConfigurationReference = 241EAEC5118E2BA90081A5BE /* project.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
CODE_SIGN_ENTITLEMENTS = Titanium.entitlements;
COPY_PHASE_STRIP = NO;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -2706,7 +2708,7 @@
baseConfigurationReference = 241EAEC5118E2BA90081A5BE /* project.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
CODE_SIGN_ENTITLEMENTS = Titanium.entitlements;
COPY_PHASE_STRIP = YES;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
ENABLE_BITCODE = NO;
Expand Down
2 changes: 1 addition & 1 deletion node_modules/archiver/node_modules/async/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/archiver/node_modules/glob/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/archiver/node_modules/lazystream/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/archiver/node_modules/lodash/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/archiver/node_modules/tar-stream/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/archiver/node_modules/zip-stream/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions node_modules/async/.jscsrc

This file was deleted.

20 changes: 20 additions & 0 deletions node_modules/async/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.