Skip to content

Commit

Permalink
Merge pull request #47 from ashcoding/1_2_X_HouseCleaning
Browse files Browse the repository at this point in the history
[TIMOB-23709] Fixing version to 1.2.5
  • Loading branch information
cheekiatng committed Aug 1, 2016
2 parents 46f7e6a + 71e6628 commit 2068b45
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion android/build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
titanium.platform=${user.home}/Library/Application Support/Titanium/mobilesdk/osx/6.0.0/android
titanium.platform=${user.home}/Library/Application Support/Titanium/mobilesdk/osx/5.4.0/android
android.platform=${env.ANDROID_SDK}/platforms/android-23
google.apis=${env.ANDROID_SDK}/add-ons/addon-google_apis-google-23
android.ndk=${env.ANDROID_NDK}
8 changes: 4 additions & 4 deletions android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 2.0.0
apiversion: 3
architectures: armeabi-v7a x86
version: 1.2.5
apiversion: 2
architectures: armeabi armeabi-v7a x86
description: hyperloop-android
author: Appcelerator
license: Appcelerator Commercial License
Expand All @@ -15,4 +15,4 @@ name: hyperloop-android
moduleid: hyperloop
guid: bdaca69f-b316-4ce6-9065-7a61e1dafa39
platform: android
minsdk: 6.0.0
minsdk: 5.4.0
2 changes: 1 addition & 1 deletion android/plugins/hyperloop/hooks/android/hyperloop.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports.cliVersion = '>=3.2';
metabase = require(path.join(__dirname, 'metabase'));

// set this to enforce a minimum Titanium SDK
var TI_MIN = '6.0.0';
var TI_MIN = '5.4.0';

/*
State.
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fi
# Force the version into the manifest files in iphone/android directories!
sed -i.bak 's/VERSION/'"$VERSION"'/g' ./android/manifest
sed -i.bak 's/VERSION/'"$VERSION"'/g' ./iphone/manifest
sed -i.bak 's/5.2.1.GA/'"$TISDK"'/g' ./android/build.properties
sed -i.bak 's/5.4.0/'"$TISDK"'/g' ./android/build.properties
sed -i.bak 's/5.4.0/'"$TISDK"'/g' ./iphone/titanium.xcconfig


Expand Down
2 changes: 1 addition & 1 deletion iphone/manifest
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: VERSION
version: 1.2.5
apiversion: 2
architectures: armv7 arm64 i386 x86_64
description: hyperloop
Expand Down

0 comments on commit 2068b45

Please sign in to comment.