Skip to content

Commit d3554a2

Browse files
committed
1.2.1 build push to bintray and someBug
1 parent 5bfedf4 commit d3554a2

27 files changed

+16
-19
lines changed

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BottomNavigation-green.svg?style=true)](https://android-arsenal.com/details/1/3612)
22
[![Build Status](https://travis-ci.org/Ashok-Varma/BottomNavigation.svg?branch=master)](https://travis-ci.org/Ashok-Varma/BottomNavigation)
3-
[![codecov](https://codecov.io/gh/Ashok-Varma/BottomNavigation/branch/master/graph/badge.svg)](https://codecov.io/gh/Ashok-Varma/BottomNavigation)
43

54
# BottomNavigation
65

@@ -32,17 +31,17 @@ Download [the latest JAR][mavenAarDownload] or grab via Maven:
3231
<dependency>
3332
<groupId>com.ashokvarma.android</groupId>
3433
<artifactId>bottom-navigation-bar</artifactId>
35-
<version>1.2.0</version>
34+
<version>1.2.1</version>
3635
<type>pom</type>
3736
</dependency>
3837
```
3938
or Gradle:
4039
```groovy
41-
compile 'com.ashokvarma.android:bottom-navigation-bar:1.2.0'
40+
compile 'com.ashokvarma.android:bottom-navigation-bar:1.2.1'
4241
```
4342
or Ivy:
4443
```xml
45-
<dependency org='com.ashokvarma.android' name='bottom-navigation-bar' rev='1.2.0'>
44+
<dependency org='com.ashokvarma.android' name='bottom-navigation-bar' rev='1.2.1'>
4645
<artifact name='$AID' ext='pom'></artifact>
4746
</dependency>
4847
```
@@ -205,5 +204,5 @@ limitations under the License.
205204

206205
[googlePlayStoreLink]: https://play.google.com/store/apps/details?id=com.ashokvarma.bottomnavigation.sample
207206
[googlePage]: https://www.google.com/design/spec/components/bottom-navigation.html
208-
[mavenAarDownload]: https://repo1.maven.org/maven2/com/ashokvarma/android/bottom-navigation-bar/1.2.0/bottom-navigation-bar-1.2.0.aar
207+
[mavenAarDownload]: https://repo1.maven.org/maven2/com/ashokvarma/android/bottom-navigation-bar/1.2.1/bottom-navigation-bar-1.2.1.aar
209208
[mavenLatestJarDownload]: https://search.maven.org/remote_content?g=com.ashokvarma.android&a=bottom-navigation-bar&v=LATEST
File renamed without changes.

library/bintray_lib.gradle bottom-navigation-bar/bintray_lib.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ artifacts {
3232

3333
// Bintray
3434
Properties properties = new Properties()
35-
def user = System.env.gradlePublishUser
36-
def key = System.env.gradlePublishKey
37-
def secret = System.env.gradlePublishSecret
35+
def defUser = System.env.gradlePublishUser
36+
def defKey = System.env.gradlePublishKey
37+
def defSecret = System.env.gradlePublishSecret
3838

39-
if (!key || !user || !secret) {
39+
if (!defKey || !defUser || !defSecret) {
4040
// This is for local build
4141
properties.load(project.rootProject.file('local.properties').newDataInputStream())
4242
} else {
4343
// This is for remote build set System Properties in travis system
44-
properties.setProperty("bintray.user", user)
45-
properties.setProperty("bintray.apikey", key)
46-
properties.setProperty("bintray.gpg.password", secret)
44+
properties.setProperty("bintray.user", defUser)
45+
properties.setProperty("bintray.apikey", defKey)
46+
properties.setProperty("bintray.gpg.password", defSecret)
4747
}
4848

4949
bintray {
File renamed without changes.
File renamed without changes.
File renamed without changes.

library/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ public void unSelect(boolean setActiveColor, int animationDuration) {
7272
anim.setDuration(animationDuration);
7373
this.startAnimation(anim);
7474

75-
// labelView.animate().scaleY(0).scaleX(0).setDuration(animationDuration).start();
76-
labelView.setScaleY(0);
77-
labelView.setScaleX(0);
75+
labelView.animate().scaleY(0).scaleX(0).setDuration(0).start();
7876
}
7977

8078
// @Override

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ANDROID_BUILD_TOOLS_VERSION=23.0.3
2525
ANDROID_BUILD_TARGET_SDK_VERSION=23
2626
ANDROID_BUILD_MIN_SDK_VERSION=14
2727

28-
APP_VERSION_NAME = 1.2.0
29-
APP_VERSION_CODE = 3
28+
APP_VERSION_NAME = 1.2.1
29+
APP_VERSION_CODE = 4
3030

3131
ANDROID_SUPPORT_LIBRARY_VERSION = 23.4.0
3232
ANDROID_PLAY_SERVICES_VERSION = 8.4.0

sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
testCompile 'junit:junit:4.12'
5252
compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
5353
compile "com.android.support:design:${supportLibraryVersion}"
54-
compile project(':library')
54+
compile project(':bottom-navigation-bar')
5555
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
5656
transitive = true;
5757
}

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':sample', ':library'
1+
include ':sample', ':bottom-navigation-bar'

0 commit comments

Comments
 (0)