Skip to content

Commit

Permalink
Hopefully fix NPE
Browse files Browse the repository at this point in the history
Update Gradle
  • Loading branch information
zacharee committed Jun 10, 2018
1 parent fb9fc64 commit 9a24037
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ android {
}

dependencies {
compile project(':library')
implementation project(':library')
//Support
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:design:27.1.1'
//Firebase
implementation 'com.google.firebase:firebase-core:12.0.1'
implementation 'com.google.firebase:firebase-crash:12.0.1'
implementation 'com.google.firebase:firebase-core:16.0.0'
implementation 'com.google.firebase:firebase-crash:16.0.0'
}

apply plugin: 'com.google.gms.google-services'
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.google.gms:google-services:3.2.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -16,6 +16,7 @@ buildscript {

allprojects {
repositories {
maven { url 'https://maven.google.com' }
jcenter()
google()
}
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ android {

dependencies {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
@Override
public void onPageSelected(int position) {
if (isAttachedToWindow) {
calculateDotPositions(getWidth(), getHeight());
setSelectedPage(position);
// this is the main event we're interested in!
} else {
Expand Down

0 comments on commit 9a24037

Please sign in to comment.