Skip to content

Commit

Permalink
Merge pull request #18 from sgtcoolguy/TIMOB-23599
Browse files Browse the repository at this point in the history
[TIMOB-23599] Android: Recompile ti.ldap module against latest SDK
  • Loading branch information
ashcoding committed Jul 21, 2016
2 parents 545bd18 + 3b6087f commit 2af167a
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 13 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@ xcuserdata
*.xcuserdata*

.idea/
libs/
libs/

android/assets
android/documentation
android/example
android/LICENSE
22 changes: 15 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
language: objective-c
osx_image: xcode7.3
env:
global:
- "MODULE_NAME=ti.ldap"
global:
- "MODULE_NAME=ti.ldap"
- TRAVIS_NODE_VERSION="4"
before_install:
- MODULE_ROOT=$PWD
- brew update
- brew install nvm
- source $(brew --prefix nvm)/nvm.sh
- nvm install 4
- npm config delete prefix
- nvm use --delete-prefix v4.4.7 4
install:
- cd $MODULE_ROOT
- curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh
- source install.sh
script:
- curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
- curl -o install.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/install.sh
- source install.sh -s "--branch master"
script:
- curl -o script.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/script.sh
- source script.sh
after_success: # and this only on success
- curl -o deploy.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/deploy.sh
- source deploy.sh
- source deploy.sh
10 changes: 5 additions & 5 deletions android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 1.1.2
apiversion: 2
architectures: armeabi armeabi-v7a x86
version: 2.0.0
apiversion: 3
architectures: armeabi-v7a x86
description: LDAP for Titanium
author: Jeff English
license: Appcelerator Commercial License
copyright: Copyright (c) 2012 by Appcelerator, Inc.
copyright: Copyright (c) 2012-2016 by Appcelerator, Inc.


# these should not be edited
name: ldap
moduleid: ti.ldap
guid: 4cf02ff0-f57e-4643-b0bd-98077e9956ec
platform: android
minsdk: 2.1.3.GA
minsdk: 6.0.0

0 comments on commit 2af167a

Please sign in to comment.