Skip to content

Commit a476ca6

Browse files
committed
Update of dependencies
1 parent 28a1bcd commit a476ca6

File tree

9 files changed

+75
-66
lines changed

9 files changed

+75
-66
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ android:
55
components:
66
- platform-tools
77
- tools
8-
- android-23
9-
- build-tools-23.0.3
8+
- android-25
9+
- build-tools-25.0.2
1010
- extra-android-support
1111
- extra-android-m2repository
1212

README.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
MultiBackStack
2-
==============
1+
Android-MultiBackStack
2+
======================
33

44
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-MultiBackStack-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/3636)
5-
[![Release](https://jitpack.io/v/jetradarmobile/multibackstack.svg)](https://jitpack.io/#jetradarmobile/multibackstack)
6-
[![Build Status](https://travis-ci.org/JetradarMobile/multibackstack.svg?branch=master)](https://travis-ci.org/JetradarMobile/multibackstack)
7-
5+
[![JitPack](https://jitpack.io/v/jetradarmobile/multibackstack.svg)](https://jitpack.io/#jetradarmobile/multibackstack)
6+
[![TravisCI](https://travis-ci.org/JetradarMobile/multibackstack.svg?branch=master)](https://travis-ci.org/JetradarMobile/android-multibackstack)
87
[![AndroidDev Digest](https://img.shields.io/badge/AndroidDev%20Digest-%2396-blue.svg)](https://www.androiddevdigest.com/digest-96/)
98

109
Implementation of the multiple back stacks. Using this library allows implementation of persistent [bottom navigation][1] like in [instagram][2].
1110

12-
![image](https://raw.githubusercontent.com/JetradarMobile/multibackstack/master/art/img_promo.jpg)
11+
![image][3]
1312

1413

1514
Compatibility
@@ -41,6 +40,12 @@ dependencies {
4140
```
4241

4342

43+
Usage
44+
-----
45+
46+
See [sample][4] project for understanding how it works.
47+
48+
4449
License
4550
-------
4651

@@ -61,3 +66,5 @@ License
6166

6267
[1]: https://www.google.com/design/spec/components/bottom-navigation.html
6368
[2]: https://play.google.com/store/apps/details?id=com.instagram.android
69+
[3]: https://raw.githubusercontent.com/JetradarMobile/multibackstack/master/art/img_promo.jpg
70+
[4]: https://github.com/JetradarMobile/android-multibackstack/tree/master/multibackstack-sample

build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ buildscript {
33
jcenter()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.1.2'
7-
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
8-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
6+
classpath 'com.android.tools.build:gradle:2.3.0-beta1'
97
}
108
}
119

@@ -15,13 +13,12 @@ allprojects {
1513
}
1614
}
1715

18-
apply plugin: 'com.github.ben-manes.versions'
19-
2016
ext {
21-
compileSdkVersion = 23
22-
buildToolsVersion = '23.0.3'
17+
compileSdkVersion = 25
18+
buildToolsVersion = '25.0.2'
2319

24-
supportAppCompat = 'com.android.support:appcompat-v7:24.1.1'
20+
supportDesign = 'com.android.support:design:25.1.0'
21+
supportAppCompat = 'com.android.support:appcompat-v7:25.1.0'
2522
bottomNavigationBar = 'com.ashokvarma.android:bottom-navigation-bar:1.3.0'
2623
}
2724

gradle/wrapper/gradle-wrapper.jar

572 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sun Jan 08 22:38:21 MSK 2017
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradlew

Lines changed: 40 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

multibackstack-sample/build.gradle

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

3+
dependencies {
4+
compile project(':multibackstack')
5+
compile rootProject.ext.supportDesign
6+
compile rootProject.ext.bottomNavigationBar
7+
}
8+
39
android {
410
compileSdkVersion rootProject.ext.compileSdkVersion
511
buildToolsVersion rootProject.ext.buildToolsVersion
@@ -11,9 +17,4 @@ android {
1117
versionCode 1
1218
versionName "1.0"
1319
}
14-
}
15-
16-
dependencies {
17-
compile project(':multibackstack')
18-
compile rootProject.ext.bottomNavigationBar
1920
}

multibackstack/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.github.dcendents.android-maven'
32

4-
group = 'com.github.jetradarmobile'
3+
dependencies {
4+
compile rootProject.ext.supportAppCompat
5+
}
56

67
android {
78
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -10,8 +11,4 @@ android {
1011
defaultConfig {
1112
minSdkVersion 9
1213
}
13-
}
14-
15-
dependencies {
16-
compile rootProject.ext.supportAppCompat
1714
}

0 commit comments

Comments
 (0)