Skip to content
This repository has been archived by the owner on May 1, 2020. It is now read-only.

Update the build #72

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@ language: java
jdk: oraclejdk7
env:
matrix:
- ANDROID_SDKS=android-22,sysimg-22 ANDROID_TARGET=android-22 ANDROID_ABI=armeabi-v7a
- ANDROID_SDKS=android-23,sysimg-23 ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
before_install:
# Install base Android SDK.
- sudo apt-get update -qq
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
- wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz
- tar xzf android-sdk_r24.3.3-linux.tgz
- wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
- tar xzf android-sdk_r24.4.1-linux.tgz
- export ANDROID_HOME=$PWD/android-sdk-linux
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools

# Gradle
- wget http://services.gradle.org/distributions/gradle-2.4-bin.zip
- unzip gradle-2.4-bin.zip
- export GRADLE_HOME=$PWD/gradle-2.4
- wget http://services.gradle.org/distributions/gradle-2.10-bin.zip
- unzip gradle-2.10-bin.zip
- export GRADLE_HOME=$PWD/gradle-2.10
- export PATH=$GRADLE_HOME/bin:$PATH

# install android build tools.
- wget https://dl-ssl.google.com/android/repository/build-tools_r22.0.1-linux.zip
- unzip build-tools_r22.0.1-linux.zip -d $ANDROID_HOME
- wget https://dl-ssl.google.com/android/repository/build-tools_r23.0.3-linux.zip
- unzip build-tools_r23.0.3-linux.zip -d $ANDROID_HOME
- mkdir -p $ANDROID_HOME/build-tools/
- mv $ANDROID_HOME/android-5.1 $ANDROID_HOME/build-tools/22.0.1
- ls -la $ANDROID_HOME/build-tools/22.0.1
- mv $ANDROID_HOME/android-6.0 $ANDROID_HOME/build-tools/23.0.3
- ls -la $ANDROID_HOME/build-tools/23.0.3
- echo $ANDROID_HOME

# Install required components.
# For a full list, run `android list sdk -a --extended`
# Note that sysimg-22 downloads the ARM, x86 and MIPS images (we should optimize this).
# Note that sysimg-23 downloads the ARM, x86 and MIPS images (we should optimize this).
# Other relevant API's
- echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
- echo yes | android update sdk --filter android-18 --no-ui --force > /dev/null
- echo yes | android update sdk --filter android-22 --no-ui --force > /dev/null
- echo yes | android update sdk --filter sysimg-22 --no-ui --force > /dev/null
- echo yes | android update sdk --filter android-23 --no-ui --force > /dev/null
- echo yes | android update sdk --filter sysimg-23 --no-ui --force > /dev/null
- echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
- echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:2.1.0'
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION_NAME=1.0
VERSION_CODE=1

ANDROID_BUILD_TOOLS_VERSION=22.0.1
ANDROID_COMPILE_SDK_VERSION=22
ANDROID_TARGET_SDK_VERSION=22
ANDROID_BUILD_TOOLS_VERSION=23.0.3
ANDROID_COMPILE_SDK_VERSION=23
ANDROID_TARGET_SDK_VERSION=23
ANDROID_MIN_SDK=14
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 02 11:53:54 PST 2015
#Tue May 03 08:45:18 CDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
5 changes: 5 additions & 0 deletions rebound-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
apply plugin: 'java'

allprojects {
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
}

dependencies {
testCompile files(
'libs/hamcrest-core-1.3.jar',
Expand Down