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-20244] Update Hyperloop module to 1.1.0 #16

Merged
merged 1 commit into from
Jan 27, 2016
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ SPEC CHECKSUMS:
GLCalendarView: 9d0be9a332bc09f556a79600a0d2d1404806f719
JBChartView: 8e65b7fbb4e7f1f2c0197575734fce4af1c19e17

COCOAPODS: 0.39.0
COCOAPODS: 0.38.2
1 change: 0 additions & 1 deletion modules/android/hyperloop/0.5.4/LICENSE

This file was deleted.

255 changes: 255 additions & 0 deletions modules/android/hyperloop/1.1.0/documentation/ios.html

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 0.5.4
version: 1.1.0
apiversion: 2
architectures: armeabi armeabi-v7a x86
description: hyperloop-android
author: Your Name
license: Specify your license
copyright: Copyright (c) 2015 Appcelerator
author: Appcelerator
license: Appcelerator Commercial License
copyright: Copyright (c) 2015 Appcelerator, Inc.

# these should not be edited
name: hyperloop-android
moduleid: hyperloop
guid: ed7888b7-3c6d-4804-b8ad-abbc30a21359
guid: bdaca69f-b316-4ce6-9065-7a61e1dafa39
platform: android
minsdk: 5.2.0.GA
Binary file removed modules/iphone/hyperloop/1.0.1/libhyperloop-jscore.a
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 1.0.1
version: 1.1.0
apiversion: 2
architectures: armv7 arm64 i386 x86_64
description: hyperloop
Expand All @@ -15,4 +15,4 @@ name: hyperloop
moduleid: hyperloop
guid: bdaca69f-b316-4ce6-9065-7a61e1dafa39
platform: iphone
minsdk: 5.0.0
minsdk: 5.2.0
Binary file removed modules/iphone/hyperloop/libhyperloop.a
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/hyperloop/hooks/android/metabase/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ exports.generateFromJSON = generateFromJSON;
if (!module.parent) {
var outputDir = path.join(__dirname, 'hyperloop'),
ANDROID_API_LEVEL = 'android-10',
classpathToAdd = process.argv[2] || '/Users/cwilliams/Library/android-sdk-macosx/platforms/' + ANDROID_API_LEVEL + '/android.jar';
classpathToAdd = process.argv[2] || '~/Library/android-sdk-macosx/platforms/' + ANDROID_API_LEVEL + '/android.jar';
metabase.loadMetabase(classpathToAdd, {platform: ANDROID_API_LEVEL}, [], function(e, data) {
if (e) {
util.logger.error(e);
Expand Down
32 changes: 32 additions & 0 deletions plugins/hyperloop/hooks/ios/filter.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/sh
#
# https://gist.github.com/steipete/bbea370b72bbc77a8040
#
APP_PATH="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"

# This script loops through the frameworks embedded in the application and
# removes unused architectures.
find "$APP_PATH" -name '*.framework' -type d | while read -r FRAMEWORK
do
FRAMEWORK_EXECUTABLE_NAME=$(defaults read "$FRAMEWORK/Info.plist" CFBundleExecutable)
FRAMEWORK_EXECUTABLE_PATH="$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME"
echo "Executable is $FRAMEWORK_EXECUTABLE_PATH"

EXTRACTED_ARCHS=()

for ARCH in $ARCHS
do
echo "Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME"
lipo -extract "$ARCH" "$FRAMEWORK_EXECUTABLE_PATH" -o "$FRAMEWORK_EXECUTABLE_PATH-$ARCH"
EXTRACTED_ARCHS+=("$FRAMEWORK_EXECUTABLE_PATH-$ARCH")
done

echo "Merging extracted architectures: ${ARCHS}"
lipo -o "$FRAMEWORK_EXECUTABLE_PATH-merged" -create "${EXTRACTED_ARCHS[@]}"
rm "${EXTRACTED_ARCHS[@]}"

echo "Replacing original executable with thinned version"
rm "$FRAMEWORK_EXECUTABLE_PATH"
mv "$FRAMEWORK_EXECUTABLE_PATH-merged" "$FRAMEWORK_EXECUTABLE_PATH"

done
21 changes: 21 additions & 0 deletions plugins/hyperloop/node_modules/async/CHANGELOG.md

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