bump versions (#141)

bump versions
Piwigo · Oct 6, 2019 · b55c8f0 · b55c8f0
1 parent fa4e863
commit b55c8f0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("com.android.application")
-    id("com.github.triplet.play") version "2.0.0"
+    id("com.github.triplet.play") version "2.4.2"
 }
 
 def isCi = "true" == System.getenv("CI")
@@ -91,8 +91,8 @@ android {
     }
 }
 
-def daggerVersion = '2.23.2'
-def okhttpVersion = '3.11.0'
+def daggerVersion = '2.24'
+def okhttpVersion = '3.14.4'
 def retrofitVersion = '2.6.1'
 def assertjVersion = '1.2.0'
 def acraVersion = '5.4.0'
@@ -121,9 +121,9 @@ dependencies {
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
     implementation 'io.reactivex:rxjava:1.3.2'
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'com.google.guava:guava:24.1-jre'
+    implementation 'com.google.guava:guava:28.1-jre'
     annotationProcessor 'com.google.guava:guava:24.1-jre'
-    implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation 'org.apache.commons:commons-lang3:3.9'
 
     implementation "ch.acra:acra-mail:$acraVersion"
     implementation "ch.acra:acra-dialog:$acraVersion"

diff --git a/app/src/main/java/org/piwigo/PiwigoApplication.java b/app/src/main/java/org/piwigo/PiwigoApplication.java
@@ -45,8 +45,7 @@
 
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
-import dagger.android.HasActivityInjector;
-import dagger.android.HasServiceInjector;
+import dagger.android.HasAndroidInjector;
 
 @AcraCore(reportContent = { ReportField.APP_VERSION_CODE,
         ReportField.APP_VERSION_NAME,
@@ -66,10 +65,9 @@
 @AcraMailSender(mailTo = "android@piwigo.org")
 @AcraDialog(resCommentPrompt = R.string.crash_dialog_comment_prompt,
         resText = R.string.crash_dialog_text)
-public class PiwigoApplication extends Application implements HasActivityInjector, HasServiceInjector {
+public class PiwigoApplication extends Application implements HasAndroidInjector {
 
-    @Inject DispatchingAndroidInjector<Activity> dispatchingAndroidInjector;
-    @Inject DispatchingAndroidInjector<Service> dispatchingAndroidServiceInjector;
+    @Inject DispatchingAndroidInjector<Object> androidInjector;
 
     private ApplicationComponent applicationComponent;
 
@@ -89,10 +87,6 @@ protected void attachBaseContext(Context base) {
         ACRA.init(this);
     }
 
-    @Override public AndroidInjector<Activity> activityInjector() {
-        return dispatchingAndroidInjector;
-    }
-
     private void initializeDependencyInjection() {
         applicationComponent = DaggerApplicationComponent.builder()
                 .applicationModule(new ApplicationModule(this))
@@ -106,10 +100,10 @@ private void initializeDependencyInjection() {
     }
 
     /**
-     * Returns an {@link AndroidInjector} of {@link Service}s.
+     * Returns an {@link AndroidInjector}.
      */
     @Override
-    public AndroidInjector<Service> serviceInjector() {
-        return dispatchingAndroidServiceInjector;
+    public AndroidInjector<Object> androidInjector() {
+        return androidInjector;
     }
 }
diff --git a/app/src/main/java/org/piwigo/ui/main/MainActivity.java b/app/src/main/java/org/piwigo/ui/main/MainActivity.java
@@ -82,14 +82,14 @@
 import dagger.android.AndroidInjection;
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
-import dagger.android.support.HasSupportFragmentInjector;
+import dagger.android.HasAndroidInjector;
 import rx.Observable;
 
-public class MainActivity extends BaseActivity implements HasSupportFragmentInjector {
+public class MainActivity extends BaseActivity implements HasAndroidInjector {
     private static final String TAG = MainActivity.class.getName();
 
     @Inject
-    DispatchingAndroidInjector<Fragment> fragmentInjector;
+    DispatchingAndroidInjector<Object> androidInjector;
     @Inject
     MainViewModelFactory viewModelFactory;
     @Inject
@@ -265,9 +265,12 @@ public void onEventMainThread(SimpleEvent event) {
         }
     }
 
+    /**
+     * Returns an {@link AndroidInjector}.
+     */
     @Override
-    public AndroidInjector<Fragment> supportFragmentInjector() {
-        return fragmentInjector;
+    public AndroidInjector<Object> androidInjector() {
+        return androidInjector;
     }
 
     private void itemSelected(int itemId) {
@@ -463,5 +466,6 @@ private String getRealPathFromURI(Uri contentUri) {
             }
         }
     }
+
 }
 
diff --git a/app/src/test/java/org/piwigo/PiwigoApplicationTest.java b/app/src/test/java/org/piwigo/PiwigoApplicationTest.java
@@ -40,6 +40,6 @@ public class PiwigoApplicationTest {
     }
 
     @Test public void shouldHaveInjector() {
-        assertThat(application.dispatchingAndroidInjector).isNotNull();
+        assertThat(application.androidInjector).isNotNull();
     }
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 23 14:10:00 CEST 2019
+#Thu Oct 03 20:27:39 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip