Skip to content

Commit 7497ee9

Browse files
authored
Merge pull request #26 from daimajia/unified_version
build: fix consumerProguardFiles typo, and unified version in gradle.properties
2 parents f5999b3 + 6ad3fb0 commit 7497ee9

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ I found the [Easing Functions](http://easings.net/) made by [Robert Penne](http:
2323
Gradle
2424

2525
```groovy
26-
implementation 'com.daimajia.easing:library:2.3@aar'
26+
implementation 'com.daimajia.easing:library:2.4@aar'
2727
```
2828
or maven
2929

3030
```xml
3131
<dependency>
3232
<groupId>com.daimajia.easing</groupId>
3333
<artifactId>library</artifactId>
34-
<version>2.3</version>
34+
<version>2.4</version>
3535
<type>apklib</type>
3636
</dependency>
3737
```

demo/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
55

66
defaultConfig {
7-
applicationId 'daimajia.com.eaing'
8-
minSdkVersion 11
9-
targetSdkVersion 29
10-
versionCode 7
11-
versionName '2.3'
7+
applicationId GROUP
8+
minSdkVersion MIN_SDK_VERSION.toInteger()
9+
targetSdkVersion TARGET_SDK_VERSION.toInteger()
10+
versionCode VERSION_CODE.toInteger()
11+
versionName VERSION_NAME
1212
}
1313

1414
lintOptions {

gradle.properties

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919

20-
VERSION_NAME=2.3
21-
VERSION_CODE=7
20+
COMPILE_SDK_VERSION=29
21+
TARGET_SDK_VERSION=29
22+
MIN_SDK_VERSION=11
23+
24+
VERSION_NAME=2.4
25+
VERSION_CODE=8
2226
GROUP=com.daimajia.easing
2327

2428
POM_DESCRIPTION=Android Animation Easing Functions

library/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
55

66
defaultConfig {
7-
minSdkVersion 11
8-
targetSdkVersion 29
9-
versionCode 7
10-
versionName '2.3'
7+
minSdkVersion MIN_SDK_VERSION.toInteger()
8+
targetSdkVersion TARGET_SDK_VERSION.toInteger()
9+
versionCode VERSION_CODE.toInteger()
10+
versionName VERSION_NAME
1111
}
1212

1313
buildTypes {
1414
release {
1515
minifyEnabled false
16-
consumerProguardFiles 'proguard-rules.txt'
16+
consumerProguardFiles 'proguard-rules.pro'
1717
}
1818
}
1919
}

0 commit comments

Comments
 (0)