Skip to content

Commit d6e3aea

Browse files
wasabeefwasabeef
committed
Merge pull request cats-oss#139 from CyberAgent/develop
Updated Travis Settings
2 parents d19670c + d3555a9 commit d6e3aea

File tree

8 files changed

+42
-73
lines changed

8 files changed

+42
-73
lines changed

‎.travis.yml

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
1-
language: java
2-
jdk: oraclejdk7
3-
before_install:
4-
# Install base Android SDK
5-
- sudo apt-get update -qq
6-
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
7-
- wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
8-
- tar xzf android-sdk_r21.0.1-linux.tgz
9-
- export ANDROID_HOME=$PWD/android-sdk-linux
10-
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
1+
language:
2+
- android
3+
jdk:
4+
- oraclejdk8
5+
6+
android:
7+
components:
8+
- build-tools-21.0.2
9+
- android-21
10+
- extra-google-m2repository
11+
- extra-android-m2repository
1112

12-
# Install Android NDK
13-
- wget http://dl.google.com/android/ndk/android-ndk-r8e-linux-x86_64.tar.bz2
14-
- tar xjf android-ndk-r8e-linux-x86_64.tar.bz2
15-
- export ANDROID_NDK_HOME=$PWD/android-ndk-r8e
13+
licenses:
14+
- 'android-sdk-license-.+'
1615

17-
# Install required Android components.
18-
- echo y | android update sdk --filter platform-tools --no-ui --force > /dev/null
19-
- echo y | android update sdk --filter tools --no-ui --force > /dev/null
20-
- echo y | android update sdk --filter build-tools-17.0.0 --no-ui --force > /dev/null
16+
notifications:
17+
email: false
2118

22-
- echo y | android update sdk --filter android-16 --no-ui --force > /dev/null
23-
- echo y | android update sdk --filter android-17 --no-ui --force > /dev/null
24-
- echo y | android update sdk --filter extra-android-support --no-ui --force > /dev/null
19+
before_script:
20+
- sudo service postgresql stop || true
21+
- sudo service mysql stop || true
22+
- sudo service memcached stop || true
23+
- sudo service bootlogd stop || true
24+
- sudo service elasticsearch stop || true
25+
- sudo service mongodb stop || true
26+
- sudo service neo4j stop || true
27+
- sudo service cassandra stop || true
28+
- sudo service riak stop || true
29+
- sudo service rsync stop || true
30+
- sudo service x11-common stop || true
31+
32+
before_install:
33+
- wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin
34+
- chmod +x android-ndk-r10c-linux-x86_64.bin
35+
- ./android-ndk-r10c-linux-x86_64.bin | egrep -v ^Extracting
36+
- export ANDROID_NDK_HOME=`pwd`/android-ndk-r10c
37+
- export PATH=${PATH}:${ANDROID_NDK_HOME}
2538

26-
# setup properties (no real values, but needed for setup)
27-
- echo "sonatypeRepo=http://doesnotmatter" > gradle.properties
28-
- echo "sonatypeSnapshotRepo=http://doesnotmatter" >> gradle.properties
29-
- echo "sonatypeUsername=doesnotmatter" >> gradle.properties
30-
- echo "sonatypePassword=doesnotmatter" >> gradle.properties
39+
script:
40+
- ./gradlew assemble --info

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.0-SNAPSHOT
1+
1.2.1-SNAPSHOT

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ VERSION_CODE=5
33
GROUP=jp.co.cyberagent.android.gpuimage
44

55
COMPILE_SDK_VERSION=21
6-
BUILD_TOOLS_VERSION=21.1.0
6+
BUILD_TOOLS_VERSION=21.0.2
77
TARGET_SDK_VERSION=21
88
MIN_SDK_VERSION=8
99

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip

‎release.sh

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎sample/AndroidManifest.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="jp.co.cyberagent.android.gpuimage.sample"
3-
android:versionCode="5"
4-
android:versionName="1.2.1-SNAPSHOT" >
5-
6-
<uses-sdk
7-
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
2+
package="jp.co.cyberagent.android.gpuimage.sample">
93

104
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
115
<uses-permission android:name="android.permission.CAMERA" />
@@ -14,6 +8,7 @@
148
<uses-permission android:name="android.permission.INTERNET" />
159

1610
<application
11+
android:allowBackup="true"
1712
android:hardwareAccelerated="true"
1813
android:icon="@drawable/ic_launcher"
1914
android:label="@string/app_name"

‎sample/res/values-v11/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<resources>
22

33
<style name="AppTheme" parent="android:Theme.Holo.Light" />
4-
<style name="AppTheme.Fullscreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
54

65
</resources>

‎sample/res/values-v14/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<resources>
22

33
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
4+
<style name="AppTheme.Fullscreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
45

56
</resources>

0 commit comments

Comments
 (0)