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.

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

Jump to bottom

[TIMOB-25005] Remove Ti.UI.iPhone namespace #9239

Merged
merged 9 commits into from Nov 14, 2017
Merged

[TIMOB-25005] Remove Ti.UI.iPhone namespace #9239

merged 9 commits into from Nov 14, 2017

Conversation

hansemannn
Copy link
Collaborator

@hansemannn hansemannn added this to the 7.0.0 milestone Jul 21, 2017
vijaysingh-axway
vijaysingh-axway reviewed Jul 26, 2017
View reviewed changes
apidoc/Titanium/UI/iPhone/ListViewSeparatorStyle.yml Outdated
deprecated:
since: "5.2.0"
removed: "7.0.0"
notes: Use <Titanium.UI.UI.TABLE_VIEW_SEPARATOR_STYLE_SINGLE_LINE> and <Titanium.UI.UI.TABLE_VIEW_SEPARATOR_STYLE_NONE> instead.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather "Titanium.UI.UI.TABLE_VIEW_SEPARATOR_STYLE_SINGLE_LINE" it should be "Titanium.UI.TABLE_VIEW_SEPARATOR_STYLE_SINGLE_LINE". Same with "Titanium.UI.UI.TABLE_VIEW_SEPARATOR_STYLE_NONE".

vijaysingh-axway
vijaysingh-axway reviewed Jul 26, 2017
View reviewed changes
apidoc/Titanium/UI/iPhone/TableViewSeparatorStyle.yml Outdated
deprecated:
since: "5.2.0"
removed: "7.0.0"
notes: Use <Titanium.UI.UI.TABLE_VIEW_SEPARATOR_STYLE_SINGLE_LINE> and <Titanium.UI.UI.TABLE_VIEW_SEPARATOR_STYLE_NONE> instead.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above .

vijaysingh-axway
vijaysingh-axway reviewed Jul 26, 2017
View reviewed changes
apidoc/Titanium/Media/Media.yml Outdated
@@ -944,6 +944,7 @@ properties:
osver: {ios: {min: "7.0"}}
deprecated:
since: "5.2.0"
since: "7.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change "since" to "remove" .

@hansemannn
Copy link
Collaborator Author

@vijaysingh-axway Great catch! Updated the PR.

vijaysingh-axway
vijaysingh-axway approved these changes Jul 26, 2017
View reviewed changes
Copy link
Contributor

@vijaysingh-axway vijaysingh-axway left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR passed.

@mukherjee2
Copy link
Contributor

@hansemannn can you please resolve the conflicts that are reported above?

@hansemannn
Copy link
Collaborator Author

@mukherjee2 Done.

@build
Copy link
Contributor

build commented Nov 3, 2017 •
edited

Fails
🚫

Tests have failed, see below for more information.
Messages
📖

👍 Hey!, You deleted more code than you added. That's awesome!

Tests:

Classname Name Time Error
android.Titanium.Network.HTTPClient clearCookieUnaffectedCheck 60.021 Error: timeout of 60000ms exceeded
ios.Titanium.UI.iOS #constants 0.003 file:///Users/build/Library/Deve

Generated by 🚫 dangerJS

@mukherjee2 mukherjee2 self-requested a review November 9, 2017 19:48
mukherjee2
mukherjee2 approved these changes Nov 9, 2017
View reviewed changes
Copy link
Contributor

@mukherjee2 mukherjee2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Node Version: 6.11.5
NPM Version: 3.10.10
Mac OS: 10.13
Appc CLI: 7.0.0-master.6
Appc CLI NPM: 4.2.11-2
Titanium SDK version: 7.0.0 locally built on PR/9239
Appcelerator Studio vers 4.10.0
Xcode 9.1/iOS 11.1 iPhone 7 Plus
This ticket is validated. I tried some properties that were moved to Ti.UI.iOS, and I tried a property that was moved to Ti.UI, and apps built and worked fine for both. FR passed.

@mukherjee2
Copy link
Contributor

@hansemannn there seems to be more conflicts now since the last resolution. Can you please merge after resolving again? It seems like others are working on the same files, and there will be conflicts again if the merge takes too long. FR has already passed now.

@mukherjee2
Copy link
Contributor

@hansemannn @vijaysingh-axway can you please resolve conflicts and merge?

@mukherjee2
Copy link
Contributor

@eric34 Can you please merge this PR?

@eric34 eric34 merged commit 776fa27 into tidev:master Nov 14, 2017
@hansemannn hansemannn mentioned this pull request Nov 15, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mukherjee2 mukherjee2 mukherjee2 approved these changes

@vijaysingh-axway vijaysingh-axway vijaysingh-axway approved these changes

Assignees
No one assigned
Labels
BREAKING CHANGES ⚠️ docs improvement in-qe-testing 🕵 ios
Projects
None yet
Milestone
7.0.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@hansemannn @mukherjee2 @build @vijaysingh-axway @eric34