Update deps & fix periodic capability job

Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-03-06 13:55:26 +01:00
parent 7cf28e775b
commit 76a435cb84
2 changed files with 30 additions and 34 deletions

View file

@ -101,7 +101,7 @@ android {
ext { ext {
supportLibraryVersion = '28.0.0' supportLibraryVersion = '28.0.0'
workVersion = "1.0.0-beta02" workVersion = "1.0.0"
} }
@ -127,25 +127,25 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.0' implementation 'androidx.multidex:multidex:2.0.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation "io.reactivex.rxjava2:rxjava:2.2.2" implementation "io.reactivex.rxjava2:rxjava:2.2.7"
implementation 'com.bluelinelabs:conductor:2.1.5' implementation 'com.bluelinelabs:conductor:2.1.5'
implementation 'com.bluelinelabs:conductor-support:2.1.5' implementation 'com.bluelinelabs:conductor-support:2.1.5'
implementation 'com.squareup.okhttp3:okhttp:3.11.0' implementation 'com.squareup.okhttp3:okhttp:3.13.1'
implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.11.0' implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.13.1'
implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.13.1'
implementation 'com.bluelinelabs:logansquare:1.3.7' implementation 'com.bluelinelabs:logansquare:1.3.7'
annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7' annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7'
implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0' implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
implementation 'com.github.aurae.retrofit2:converter-logansquare:1.4.1' implementation 'com.github.aurae.retrofit2:converter-logansquare:1.4.1'
implementation 'com.google.dagger:dagger:2.17' implementation 'com.google.dagger:dagger:2.21'
annotationProcessor 'com.google.dagger:dagger-compiler:2.17' annotationProcessor 'com.google.dagger:dagger-compiler:2.21'
implementation 'com.github.lukaspili.autodagger2:autodagger2:1.1' implementation 'com.github.lukaspili.autodagger2:autodagger2:1.1'
annotationProcessor 'com.github.lukaspili.autodagger2:autodagger2-compiler:1.1' annotationProcessor 'com.github.lukaspili.autodagger2:autodagger2-compiler:1.1'
@ -155,33 +155,33 @@ dependencies {
implementation 'io.requery:requery:1.5.1' implementation 'io.requery:requery:1.5.1'
implementation 'io.requery:requery-android:1.5.1' implementation 'io.requery:requery-android:1.5.1'
implementation 'net.zetetic:android-database-sqlcipher:3.5.9' implementation 'net.zetetic:android-database-sqlcipher:4.0.1'
annotationProcessor 'io.requery:requery-processor:1.5.1' annotationProcessor 'io.requery:requery-processor:1.5.1'
implementation 'org.parceler:parceler-api:1.1.11' implementation 'org.parceler:parceler-api:1.1.12'
annotationProcessor 'org.parceler:parceler:1.1.11' annotationProcessor 'org.parceler:parceler:1.1.12'
implementation 'net.orange-box.storebox:storebox-lib:1.4.0' implementation 'net.orange-box.storebox:storebox-lib:1.4.0'
compileOnly "org.projectlombok:lombok:1.18.4" compileOnly "org.projectlombok:lombok:1.18.6"
annotationProcessor "org.projectlombok:lombok:1.18.4" annotationProcessor "org.projectlombok:lombok:1.18.6"
implementation 'com.jakewharton:butterknife:10.0.0' implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
implementation 'com.github.HITGIF:TextFieldBoxes:1.4.3' implementation 'com.github.HITGIF:TextFieldBoxes:1.4.3'
implementation 'eu.davidea:flexible-adapter:5.1.0' implementation 'eu.davidea:flexible-adapter:5.1.0'
implementation 'eu.davidea:flexible-adapter-ui:1.0.0' implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
implementation 'com.github.bumptech.glide:glide:4.8.0' implementation 'com.github.bumptech.glide:glide:4.9.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0@aar' implementation 'com.github.bumptech.glide:okhttp3-integration:4.9.0@aar'
implementation 'com.facebook.fresco:fresco:1.11.0' implementation 'com.facebook.fresco:fresco:1.13.0'
implementation 'com.facebook.fresco:animated-webp:1.11.0' implementation 'com.facebook.fresco:animated-webp:1.13.0'
implementation 'com.facebook.fresco:webpsupport:1.11.0' implementation 'com.facebook.fresco:webpsupport:1.13.0'
implementation 'com.facebook.fresco:animated-gif:1.11.0' implementation 'com.facebook.fresco:animated-gif:1.13.0'
implementation "com.facebook.fresco:imagepipeline-okhttp3:1.11.0" implementation "com.facebook.fresco:imagepipeline-okhttp3:1.13.0"
implementation 'org.webrtc:google-webrtc:1.0.23295' implementation 'org.webrtc:google-webrtc:1.0.23295'
implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
@ -189,9 +189,9 @@ dependencies {
implementation 'com.yarolegovich:lovelyinput:1.0.9' implementation 'com.yarolegovich:lovelyinput:1.0.9'
implementation 'com.yarolegovich:mp:1.0.9' implementation 'com.yarolegovich:mp:1.0.9'
implementation 'me.zhanghai.android.effortlesspermissions:library:1.0.2' implementation 'me.zhanghai.android.effortlesspermissions:library:1.1.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
implementation 'com.github.wooplr:Spotlight:1.3' implementation 'com.github.wooplr:Spotlight:1.3'

View file

@ -26,6 +26,7 @@ import android.util.Log;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.multidex.MultiDex; import androidx.multidex.MultiDex;
import androidx.multidex.MultiDexApplication; import androidx.multidex.MultiDexApplication;
import androidx.work.ExistingPeriodicWorkPolicy;
import androidx.work.OneTimeWorkRequest; import androidx.work.OneTimeWorkRequest;
import androidx.work.PeriodicWorkRequest; import androidx.work.PeriodicWorkRequest;
import androidx.work.WorkManager; import androidx.work.WorkManager;
@ -140,21 +141,16 @@ public class NextcloudTalkApplication extends MultiDexApplication implements Lif
OneTimeWorkRequest pushRegistrationWork = new OneTimeWorkRequest.Builder(PushRegistrationWorker.class).build(); OneTimeWorkRequest pushRegistrationWork = new OneTimeWorkRequest.Builder(PushRegistrationWorker.class).build();
OneTimeWorkRequest accountRemovalWork = new OneTimeWorkRequest.Builder(AccountRemovalWorker.class).build(); OneTimeWorkRequest accountRemovalWork = new OneTimeWorkRequest.Builder(AccountRemovalWorker.class).build();
PeriodicWorkRequest periodicCapabilitiesUpdateWork = new PeriodicWorkRequest.Builder(CapabilitiesWorker.class, PeriodicWorkRequest periodicCapabilitiesUpdateWork = new PeriodicWorkRequest.Builder(CapabilitiesWorker.class,
1, TimeUnit.DAYS).build(); 12, TimeUnit.HOURS).build();
OneTimeWorkRequest capabilitiesUpdateWork = new OneTimeWorkRequest.Builder(CapabilitiesWorker.class).build(); OneTimeWorkRequest capabilitiesUpdateWork = new OneTimeWorkRequest.Builder(CapabilitiesWorker.class).build();
OneTimeWorkRequest signalingSettingsWork = new OneTimeWorkRequest.Builder(SignalingSettingsWorker.class).build(); OneTimeWorkRequest signalingSettingsWork = new OneTimeWorkRequest.Builder(SignalingSettingsWorker.class).build();
//WorkManager.initialize(getApplicationContext(), new Configuration.Builder().build());
WorkManager.getInstance().enqueue(pushRegistrationWork); WorkManager.getInstance().enqueue(pushRegistrationWork);
WorkManager.getInstance().enqueue(accountRemovalWork); WorkManager.getInstance().enqueue(accountRemovalWork);
WorkManager.getInstance().enqueue(capabilitiesUpdateWork); WorkManager.getInstance().enqueue(capabilitiesUpdateWork);
WorkManager.getInstance().enqueue(signalingSettingsWork); WorkManager.getInstance().enqueue(signalingSettingsWork);
WorkManager.getInstance().enqueueUniquePeriodicWork("DailyCapabilitiesUpdateWork", ExistingPeriodicWorkPolicy.REPLACE, periodicCapabilitiesUpdateWork);
// There is a bug with periodic work so we ignore this for now
//WorkManager.getInstance().enqueueUniquePeriodicWork("DailyCapabilitiesUpdateWork",
// ExistingPeriodicWorkPolicy.REPLACE, periodicCapabilitiesUpdateWork);
WorkManager.getInstance().cancelUniqueWork("DailyCapabilitiesUpdateWork");
EmojiManager.install(new TwitterEmojiProvider()); EmojiManager.install(new TwitterEmojiProvider());
} }