Skip to content

Commit

Permalink
Merge pull request #283 from ZeusWPI/fix-intro
Browse files Browse the repository at this point in the history
Fix crash on startup in onboarding
  • Loading branch information
niknetniko authored Oct 16, 2018
2 parents 6991624 + e049066 commit 6405785
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ dependencies {
implementation 'net.sourceforge.streamsupport:android-retrostreams:1.6.3'
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
implementation 'com.heinrichreimersoftware:material-intro:1.6.2'

// This fork contains a newer version that doesn't crash as much.
// Once this version is released, we can use the original repo again.
implementation 'com.github.niknetniko:material-intro:master-SNAPSHOT'
implementation 'com.jonathanfinerty.once:once:1.2.2'
implementation 'com.karumi:dexter:4.2.0'
implementation 'com.github.captain-miao:optroundcardview:1.1.0'
Expand All @@ -187,7 +190,7 @@ dependencies {
testImplementation 'org.mockito:mockito-core:2.19.0'

testImplementation 'org.robolectric:robolectric:4.0-beta-2-SNAPSHOT'
testImplementation 'androidx.test:core:1.0.0-beta01'
testImplementation 'androidx.test:core:1.0.0-beta02'

debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
// TODO: why are there so many false positives when this is enabled?
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.gms:google-services:4.0.2'
classpath 'com.jaredsburrows:gradle-license-plugin:0.8.41'
classpath 'io.fabric.tools:gradle:1.25.4'
Expand Down

0 comments on commit 6405785

Please sign in to comment.