From 3ee117fae7aca31848d3fa501e3a2fa1ac2467ba Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 21 May 2019 07:50:11 +0200 Subject: [PATCH 1/4] Updated Dagger in the login library --- libs/login/WordPressLoginFlow/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle index 2e67d681283c..768b57e640f4 100644 --- a/libs/login/WordPressLoginFlow/build.gradle +++ b/libs/login/WordPressLoginFlow/build.gradle @@ -61,11 +61,11 @@ dependencies { annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1' // Dagger - implementation 'com.google.dagger:dagger:2.11' - annotationProcessor 'com.google.dagger:dagger-compiler:2.11' + implementation 'com.google.dagger:dagger:2.22.1' + annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1' compileOnly 'org.glassfish:javax.annotation:10.0-b28' - implementation 'com.google.dagger:dagger-android-support:2.11' - annotationProcessor 'com.google.dagger:dagger-android-processor:2.11' + implementation 'com.google.dagger:dagger-android-support:2.22.1' + annotationProcessor 'com.google.dagger:dagger-android-processor:2.22.1' lintChecks 'org.wordpress:lint:1.0.1' } From af9b77819f3324e12c8e4ace8a4cc59c158f732f Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 21 May 2019 08:11:07 +0200 Subject: [PATCH 2/4] Updated Dagger version to 2.22.1 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 72d48d99ee7a..0c92126965f0 100644 --- a/build.gradle +++ b/build.gradle @@ -104,6 +104,6 @@ buildScan { } ext { - daggerVersion = '2.11' - fluxCVersion = 'ed6d69693da290807e017f34cdedfa76bf0648e9' + daggerVersion = '2.22.1' + fluxCVersion = 'f80be620a514cd4ca36479e260d02b3ae8a6d6da' } From dd828db9f52e9944f51c295e3694b8b2f6bb5e2b Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 21 May 2019 09:33:23 +0200 Subject: [PATCH 3/4] Fix build - replace Nullable import from javax to android.support --- .../org/wordpress/android/ui/prefs/ReleaseNotesActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/ReleaseNotesActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/ReleaseNotesActivity.java index a9aced40f113..447b97fb5c3e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/ReleaseNotesActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/ReleaseNotesActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -21,7 +22,6 @@ import org.wordpress.android.ui.accounts.HelpActivity; import org.wordpress.android.ui.accounts.HelpActivity.Origin; -import javax.annotation.Nullable; import javax.inject.Inject; /** From acad77990c29f9ab74409421d9f2df4d6502da08 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Tue, 21 May 2019 15:06:47 -0400 Subject: [PATCH 4/4] Updated FluxC hash to match FluxC Dagger merge --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0c92126965f0..cb634782b3b9 100644 --- a/build.gradle +++ b/build.gradle @@ -105,5 +105,5 @@ buildScan { ext { daggerVersion = '2.22.1' - fluxCVersion = 'f80be620a514cd4ca36479e260d02b3ae8a6d6da' + fluxCVersion = '89b24713e6d8b239973883cdd601c9304d19a3ef' }