-
-
Notifications
You must be signed in to change notification settings - Fork 4
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-20602] Hyperloop: Build doesn't work with 5.4.0 #9
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
titanium.platform=${user.home}/Library/Application Support/Titanium/mobilesdk/osx/5.2.0.GA/android | ||
titanium.platform=${user.home}/Library/Application Support/Titanium/mobilesdk/osx/5.4.0.GA/android | ||
android.platform=/opt/android-sdk/platforms/android-23 | ||
google.apis=/opt/android-sdk/add-ons/addon-google_apis-google-23 | ||
android.ndk=/opt/android-ndk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ exports.init = init; | |
// set this to enforce a ios-min-version | ||
var IOS_MIN = '7.0'; | ||
// set this to enforce a minimum Titanium SDK | ||
var TI_MIN = '5.2.0'; | ||
var TI_MIN = '5.4.0'; | ||
// set the iOS SDK minium | ||
var IOS_SDK_MIN = '9.0'; | ||
|
||
|
@@ -136,12 +136,11 @@ HyperloopiOSBuilder.prototype.validate = function validate() { | |
process.exit(1); | ||
} | ||
|
||
// check for the run-on-main-thread configuration | ||
if (!this.builder.tiapp.ios['run-on-main-thread']) { | ||
if (!(this.builder.tiapp.properties && this.builder.tiapp.properties.hasOwnProperty('run-on-main-thread') && this.builder.tiapp.properties['run-on-main-thread'].value)) { | ||
this.logger.error('You cannot use the Hyperloop compiler without configuring iOS to use main thread execution.'); | ||
this.logger.error('Add the following to your tiapp.xml <ios> section:'); | ||
this.logger.error('Add the following to your tiapp.xml <ti:app> section:'); | ||
this.logger.error(''); | ||
this.logger.error(' <run-on-main-thread>true</run-on-main-thread>\n'); | ||
this.logger.error(' <property name="run-on-main-thread" type="bool">true</property>'); | ||
process.exit(1); | ||
} | ||
|
||
|
@@ -987,7 +986,7 @@ HyperloopiOSBuilder.prototype.hookXcodebuild = function hookXcodebuild(data) { | |
}); | ||
} | ||
|
||
addParam('GCC_PREPROCESSOR_DEFINITIONS', 'HYPERLOOP=1'); | ||
addParam('GCC_PREPROCESSOR_DEFINITIONS', '$(inherited) HYPERLOOP=1'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great idea! 🚀 |
||
|
||
// inject the params into the xcodebuild args | ||
var args = data.args[1]; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found some more places where we need to replace the 5.2.0 version with 5.4.0 (see attached screenshot)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Just note that build.properties and titanium.xconfig is subject to the local machine with 5.4.0 installed. Most likely will standardise this on travis ci (in another ticket)