Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #105

Merged
merged 2 commits into from
Oct 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.60'
ext.kotlin_version = '1.2.71'
repositories {
google()
maven { url 'https://maven.fabric.io/public' }
Expand All @@ -10,7 +10,7 @@ buildscript {
jcenter()
}
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.1'
classpath 'com.google.firebase:firebase-plugins:1.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand Down
2 changes: 1 addition & 1 deletion client-data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

kapt 'com.google.dagger:dagger-compiler:2.17'
kapt 'com.google.dagger:dagger-compiler:2.18'

api project(':client-domain')

Expand Down
5 changes: 3 additions & 2 deletions client-domain/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'java-library'
apply plugin: 'com.android.lint'
apply plugin: 'kotlin'

configurations {
Expand All @@ -14,8 +15,8 @@ sourceSets {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

api 'com.google.dagger:dagger:2.17'
provided 'com.google.dagger:dagger-compiler:2.17'
api 'com.google.dagger:dagger:2.18'
provided 'com.google.dagger:dagger-compiler:2.18'

api 'io.reactivex.rxjava2:rxjava:2.2.2'
api 'com.squareup.okhttp3:okhttp:3.11.0'
Expand Down
19 changes: 9 additions & 10 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,26 @@ dependencies {
implementation 'com.android.support:animated-vector-drawable:28.0.0'
implementation 'com.android.support:support-media-compat:28.0.0'

implementation 'com.google.firebase:firebase-core:16.0.3'
implementation 'com.google.firebase:firebase-config:16.0.0'
implementation 'com.google.firebase:firebase-perf:16.1.0'
implementation 'com.google.firebase:firebase-messaging:17.3.2'
implementation 'com.google.firebase:firebase-database:16.0.2'
implementation 'com.google.firebase:firebase-core:16.0.4'
implementation 'com.google.firebase:firebase-config:16.1.0'
implementation 'com.google.firebase:firebase-perf:16.1.2'
implementation 'com.google.firebase:firebase-messaging:17.3.4'
implementation 'com.google.firebase:firebase-database:16.0.3'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'

implementation 'android.arch.lifecycle:runtime:1.1.1'

implementation 'com.facebook.fresco:fresco:1.10.0'
implementation 'com.facebook.fresco:fresco:1.11.0'

implementation 'com.jakewharton:butterknife:8.8.1'
kapt 'com.jakewharton:butterknife-compiler:8.8.1'

implementation 'com.airbnb.android:epoxy:2.18.0'
implementation 'com.airbnb.android:epoxy:2.19.0'

kapt 'com.google.dagger:dagger-compiler:2.17'
kapt 'com.google.dagger:dagger-compiler:2.18'

implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0'
implementation 'com.jakewharton.threetenabp:threetenabp:1.1.1'

testImplementation 'com.google.code.gson:gson:2.8.5'

Expand All @@ -105,7 +105,6 @@ dependencies {
androidTestImplementation 'org.mockito:mockito-android:2.22.0'
androidTestImplementation 'com.airbnb.okreplay:okreplay:1.4.0'
androidTestImplementation 'com.airbnb.okreplay:espresso:1.4.0'

}

apply plugin: 'com.google.gms.google-services'
Expand Down
5 changes: 0 additions & 5 deletions client/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
<service android:name=".push.PushTokenService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
</service>

<activity android:name=".ui.ShortcutHandlerActivity" />
<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@ import com.google.firebase.messaging.RemoteMessage
import com.jraska.github.client.GitHubClientApp

class PushHandleService : FirebaseMessagingService() {
override fun onMessageReceived(remoteMessage: RemoteMessage?) {
val app = application as GitHubClientApp
val action = RemoteMessageToActionConverter.convert(remoteMessage!!)
override fun onMessageReceived(remoteMessage: RemoteMessage) {
val action = RemoteMessageToActionConverter.convert(remoteMessage)

pushHandler().handlePush(action)
}

app.pushHandler().handlePush(action)
override fun onNewToken(p0: String?) {
pushHandler().onTokenRefresh()
}

fun pushHandler(): PushHandler {
val app = application as GitHubClientApp
return app.pushHandler()
}
}

This file was deleted.