Skip to content

Commit e02aa9f

Browse files
committed
1 parent c80378c commit e02aa9f

37 files changed

+45
-1402
lines changed

.travis.yml

Lines changed: 19 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,33 @@
11
language: java
2-
3-
branches:
4-
only:
5-
- dev
6-
- master
7-
82
jdk: oraclejdk7
9-
103
env:
11-
global:
12-
- ANDROID_SDK_VERSION="r22.6.2"
13-
14-
notifications:
15-
email: false
16-
4+
matrix:
5+
- ANDROID_TARGET=android-20 ANDROID_ABI=armeabi-v7a
176

187
before_install:
19-
20-
# environment info
21-
- gradle -v
22-
- uname -a
23-
24-
# required libs for android build tools
25-
# Update a system for ia32 libraries
8+
# Install base Android SDK
269
- sudo apt-get update -qq
27-
- if [ `uname -m` = x86_64 ]; then sudo apt-get update; fi
28-
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
29-
30-
# for gradle output style
31-
- export TERM=dumb
32-
33-
# newer version of gradle
34-
# - wget http://services.gradle.org/distributions/gradle-1.12-bin.zip
35-
# - unzip -qq gradle-1.12-bin.zip
36-
# - export GRADLE_HOME=$PWD/gradle-1.11
37-
# - export PATH=$GRADLE_HOME/bin:$PATH
38-
39-
# just to test gradle version, against our provided one
40-
- gradle -v
41-
42-
# newest android SDK
43-
- wget http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-linux.tgz
44-
- tar -zxf android-sdk_${ANDROID_SDK_VERSION}-linux.tgz
45-
- export ANDROID_HOME=`pwd`/android-sdk-linux
10+
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
11+
- wget http://dl.google.com/android/android-sdk_r23-linux.tgz
12+
- tar xzf android-sdk_r23-linux.tgz
13+
- export ANDROID_HOME=$PWD/android-sdk-linux
4614
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
4715

48-
# manually set sdk.dir variable, according to local paths
49-
- echo "sdk.dir=$ANDROID_HOME" > local.properties
16+
# Gradle
17+
- wget http://services.gradle.org/distributions/gradle-1.12-bin.zip
18+
- unzip gradle-1.12-bin.zip
19+
- export GRADLE_HOME=$PWD/gradle-1.12
20+
- export PATH=$GRADLE_HOME/bin:$PATH
5021

51-
# Install required components.
22+
# Install required components
5223
# For a full list, run `android list sdk -a --extended`
24+
# Note that sysimg-19 downloads only ARM, because only the first license query is accepted.
5325
- echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
54-
- echo yes | android update sdk --all --filter build-tools-19.1.0 --no-ui --force > /dev/null
55-
- echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
26+
- echo yes | android update sdk --all --filter build-tools-20.0.0 --no-ui --force > /dev/null
27+
- echo yes | android update sdk --filter android-20 --no-ui --force > /dev/null
28+
- echo yes | android update sdk --filter sys-img-x86-android-19 --no-ui --force > /dev/null
5629
- echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
5730
- echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
5831

59-
# Otherwise
60-
#- echo yes | android update sdk -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-19 --force --no-ui
61-
62-
63-
# Let's try to build...
64-
install: ./gradlew clean build
65-
66-
script: gradle check
32+
install:
33+
- ./gradlew assemble

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ One day, I saw [an iOS library](https://github.com/ArtFeel/AFViewShaker), which
44

55
So, I started to collect animation effects... and in two days, this project born.
66

7-
8-
2014-06-27
9-
10-
I have implemented [Animation Easing](http://easings.net/) [functions](https://github.com/daimajia/AndroidViewAnimations/tree/master/library/src/main/java/com/daimajia/androidanimations/library/easing_functions), based on [Rober Penner's Easing functions](http://www.robertpenner.com/easing/).
11-
You can use easing functions to make your animation more real! It's pretty complex, but don't worrr, I'll add some examples later. :-D
127
# Demo
138

149
![](http://ww3.sinaimg.cn/mw690/610dc034jw1ehnv2r93jpg20bx0kokjl.gif)
@@ -20,8 +15,9 @@ You can use easing functions to make your animation more real! It's pretty compl
2015

2116
```groovy
2217
dependencies {
23-
compile 'com.nineoldandroids:library:2.4.0'
24-
compile 'com.daimajia.androidanimations:library:1.0.5@aar'
18+
compile 'com.nineoldandroids:library:2.4.0'
19+
compile 'com.daimajia.easing:library:1.0.0@aar'
20+
compile 'com.daimajia.androidanimations:library:1.0.6@aar'
2521
}
2622
```
2723
or Maven
@@ -35,7 +31,13 @@ or Maven
3531
<dependency>
3632
<groupId>com.daimajia.androidanimation</groupId>
3733
<artifactId>library</artifactId>
38-
<version>1.0.5</version>
34+
<version>1.0.6</version>
35+
<type>apklib</type>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.daimajia.easing</groupId>
39+
<artifactId>library</artifactId>
40+
<version>1.0.0</version>
3941
<type>apklib</type>
4042
</dependency>
4143
```

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.11.+'
8+
classpath 'com.android.tools.build:gradle:0.12.+'
99
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

demo/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply plugin: 'android-sdk-manager'
22
apply plugin: 'android'
33

44
android {
5-
compileSdkVersion 19
6-
buildToolsVersion "19.1.0"
5+
compileSdkVersion 20
6+
buildToolsVersion "20"
77

88
defaultConfig {
99
applicationId "com.daimajia.androidanimations"
1010
minSdkVersion 8
11-
targetSdkVersion 19
11+
targetSdkVersion 20
1212
versionCode 1
1313
versionName "1.0"
1414
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# org.gradle.parallel=true
1919

2020

21-
VERSION_NAME=1.0.5
22-
VERSION_CODE=6
21+
VERSION_NAME=1.0.6
22+
VERSION_CODE=7
2323
GROUP=com.daimajia.androidanimations
2424

2525
POM_DESCRIPTION=Collect android animations
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Sat Jun 28 18:37:32 CST 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

library/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'android-library'
22

33
android {
4-
compileSdkVersion 19
5-
buildToolsVersion "19.1.0"
4+
compileSdkVersion 20
5+
buildToolsVersion "20.0.0"
66

77
defaultConfig {
88
applicationId "com.daimajia.androidanimations.library"
99
minSdkVersion 8
10-
targetSdkVersion 19
11-
versionCode 6
12-
versionName "1.0.5"
10+
targetSdkVersion 20
11+
versionCode 7
12+
versionName "1.0.6"
1313
}
1414
buildTypes {
1515
release {
@@ -22,5 +22,6 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile 'com.nineoldandroids:library:2.4.0'
25+
compile 'com.daimajia.easing:library:1.0.0@aar'
2526
}
2627
apply from: './gradle-mvn-push.gradle'

library/src/main/java/com/daimajia/androidanimations/library/easing_functions/BaseEasingMethod.java

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

library/src/main/java/com/daimajia/androidanimations/library/easing_functions/Glider.java

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

library/src/main/java/com/daimajia/androidanimations/library/easing_functions/Skill.java

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

0 commit comments

Comments
 (0)