Merge pull request #621 from squanchy-dev/update_stuff

Update stuff
squanchy-dev · Feb 4, 2019 · 45b5b4b · 45b5b4b
2 parents df5ea4b + 03af57a
commit 45b5b4b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
 plugins {
     id 'com.github.ben-manes.versions' version '0.20.0'
     id 'io.gitlab.arturbosch.detekt' version '1.0.0-RC12'
-    id 'org.jlleitschuh.gradle.ktlint' version '6.3.1'
+    id 'org.jlleitschuh.gradle.ktlint' version '7.0.0'
 }
 
 def teamPropsFile(propsFile) {
@@ -41,11 +41,6 @@ subprojects {
     repositories {
         google()
         maven { url 'https://maven.fabric.io/public' }
-        maven {
-            // TODO remove once Google restores all the stuff they've nuked from JCenter :facepalm:
-            // See https://issuetracker.google.com/issues/120759347#comment36
-            url "https://google.bintray.com/flexbox-layout"
-        }
         mavenCentral()
         jcenter()
         maven { url 'https://jitpack.io' }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,16 +1,16 @@
 ext {
     daggerVersion = '2.21'
     glideVersion = '4.8.0'
-    workManagerVersion = "1.0.0-beta02"
+    workManagerVersion = '1.0.0-beta03'
     kotlinVersion = '1.3.20'
     moshiVersion = '1.8.0'
 
     detektVersion = '1.0.0-RC12'
-    ktlintVersion = '0.29.0'
+    ktlintVersion = '0.30.0'
 
     gradlePlugins = [
         buildProperties: 'com.novoda:gradle-build-properties-plugin:0.4.1',
-        fabric         : 'io.fabric.tools:gradle:1.27.0',
+        fabric         : 'io.fabric.tools:gradle:1.27.1',
         kotlin         : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
     ]
 
@@ -20,8 +20,8 @@ ext {
             androidxAnnotations     : "androidx.annotation:annotation:1.0.1",
             androidxAppCompat       : "androidx.appcompat:appcompat:1.1.0-alpha01",
             androidxConstraintLayout: 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3',
-            androidxKtx             : 'androidx.core:core-ktx:1.1.0-alpha03',
-            androidxMaterial        : 'com.google.android.material:material:1.1.0-alpha02',
+            androidxKtx             : 'androidx.core:core-ktx:1.1.0-alpha04',
+            androidxMaterial        : 'com.google.android.material:material:1.1.0-alpha03',
             androidxWorkManager     : "android.arch.work:work-runtime-ktx:$workManagerVersion",
             androidxWorkManagerRx   : "android.arch.work:work-rxjava2:$workManagerVersion",
             arrowCore               : 'io.arrow-kt:arrow-core:0.8.2',
@@ -30,8 +30,8 @@ ext {
             daggerCompiler          : "com.google.dagger:dagger-compiler:${daggerVersion}",
             firebaseAuth            : 'com.google.firebase:firebase-auth:16.1.0',
             firebaseConfig          : 'com.google.firebase:firebase-config:16.1.3',
-            firebaseCore            : 'com.google.firebase:firebase-core:16.0.6',
-            firebaseFirestore       : 'com.google.firebase:firebase-firestore:17.1.5',
+            firebaseCore            : 'com.google.firebase:firebase-core:16.0.7',
+            firebaseFirestore       : 'com.google.firebase:firebase-firestore:18.0.0',
             firebaseMessaging       : 'com.google.firebase:firebase-messaging:17.3.4',
             firebaseStorage         : 'com.google.firebase:firebase-storage:16.0.5',
             firebaseUiStorage       : 'com.firebaseui:firebase-ui-storage:4.3.1',
@@ -47,7 +47,7 @@ ext {
             rxAndroid               : 'io.reactivex.rxjava2:rxandroid:2.1.0',
             rxJava                  : 'io.reactivex.rxjava2:rxjava:2.2.6',
             rxKotlin                : 'io.reactivex.rxjava2:rxkotlin:2.3.0',
-            rxLint                  : 'nl.littlerobots.rxlint:rxlint:1.7.2',
+            rxLint                  : 'nl.littlerobots.rxlint:rxlint:1.7.3',
             threeTenAbp             : 'com.jakewharton.threetenabp:threetenabp:1.1.1',
             timber                  : 'com.jakewharton.timber:timber:4.7.1',
             viewPagerAdapter        : 'com.novoda:view-pager-adapter:1.0.0'
@@ -56,7 +56,7 @@ ext {
         test: [
             truth     : 'com.google.truth:truth:0.42',
             jUnit4    : 'junit:junit:4.12',
-            mockito   : 'org.mockito:mockito-inline:2.23.4',
+            mockito   : 'org.mockito:mockito-inline:2.24.0',
             threeTenBp: 'org.threeten:threetenbp:1.3.8'
         ]
     ]

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists