Skip to content
This repository has been archived by the owner on Dec 5, 2017. It is now read-only.

Commit

Permalink
Merge pull request #28 from nhaarman/dev
Browse files Browse the repository at this point in the history
3.0.0
  • Loading branch information
nhaarman committed May 1, 2014
2 parents 984e061 + 354b4e0 commit 63ce6a8
Show file tree
Hide file tree
Showing 69 changed files with 1,538 additions and 911 deletions.
85 changes: 10 additions & 75 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,76 +1,11 @@
# built application files
*bin\.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/

# Local configuration file (sdk path, etc)
local.properties

assets/

.settings
eclipsebin

bin
gen
build
out
lib
local.properties

target
pom.xml.*
release.properties

.idea
*.iml
classes

obj

**/bin/*
**/target/*
**/gen/*
**/build/*
**/.idea/*
**/*.iml
.gradle
/local.properties
/.idea/workspace.xml
.DS_Store

#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
example/.classpath
example/.project
example/proguard-project.txt
*/.classpath
*.project
*proguard-project.txt
library/build.gradle
.metadata/*
40 changes: 40 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
language: java
jdk: oraclejdk7

env:
matrix:
- ANDROID_SDKS=sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a SKIN=WXGA800 LINT=true
global:
- TERM=dumb
- secure: A5Bq4mDhsHqKK8PlxNlxVGJuSBi1L2uBg817821AOXyPjSSXS5GQK+4bIp+io8R/bPzxCNuC8nqJUvupa0GrEgKhzfA0JF5nhMjLyZ5cfpbNOYWCJHlbiZCDkW4MFhtWTCGedu3sQ8WifyJ25ceh+1nxxAn/hIhJUfYssNw1+8Q=
before_install:
# Install base Android SDK
- sudo apt-get update -qq
- sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
- export COMPONENTS=extra-android-m2repository,build-tools-19.0.3,android-19,$ANDROID_SDKS
- curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-2/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
- source ~/.android-sdk-installer/env

# Create and start emulator
#- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI --skin $SKIN
#- emulator -avd test -no-audio -no-window &

before_script:
# Make sure the emulator has started before running tests
#- wait_for_emulator

install:
- true

script:
- sudo chmod +x gradlew
#- ./gradlew connectedCheck

- if [[ $LINT == 'true' ]]; then ./gradlew lint ; fi

after_success:
- ./gradlew uploadArchives -PnexusUsername="${nexusUsername}" -PnexusPassword="${nexusPassword}"

notifications:
email: false
202 changes: 0 additions & 202 deletions LICENSE.txt

This file was deleted.

Loading

0 comments on commit 63ce6a8

Please sign in to comment.