Skip to content

Commit 372414a

Browse files
authored
Merge pull request #187 from ncapdevi/3.1.0
3.1.0
2 parents 77ceb1d + b7d2bd1 commit 372414a

27 files changed

+230
-292
lines changed

.idea/compiler.xml

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

.idea/copyright/profiles_settings.xml

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

.idea/encodings.xml

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

.idea/gradle.xml

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

.idea/misc.xml

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

.idea/modules.xml

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

.idea/runConfigurations.xml

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

.idea/vcs.xml

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

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ install:
6666
- echo yes | sdkmanager "extras;google;m2repository"
6767

6868
script:
69-
- ./gradlew connectedAndroidTest coveralls
69+
- ./gradlew jacocoTestReportDebug coveralls

app/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ repositories {
2727

2828
dependencies {
2929
implementation project(':frag-nav')
30-
// implementation 'com.ncapdevi:frag-nav:2.2.1'
31-
implementation project(':frag-nav')
32-
implementation "com.android.support:design:$rootProject.ext.supportVersion"
33-
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
30+
implementation "com.google.android.material:material:$rootProject.ext.supportVersion"
31+
implementation "androidx.appcompat:appcompat:1.0.2"
3432
implementation "com.roughike:bottom-bar:2.3.1"
3533
testImplementation "junit:junit:$rootProject.ext.junitVersion"
3634
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

0 commit comments

Comments
 (0)