diff --git a/README.md b/README.md
index 008cdcdde..648335300 100644
--- a/README.md
+++ b/README.md
@@ -39,16 +39,16 @@ libraries.
 ```groovy
 dependencies {
 // FirebaseUI for Firebase Realtime Database
-implementation 'com.firebaseui:firebase-ui-database:3.1.1'
+implementation 'com.firebaseui:firebase-ui-database:3.1.2'
 
 // FirebaseUI for Cloud Firestore
-implementation 'com.firebaseui:firebase-ui-firestore:3.1.1'
+implementation 'com.firebaseui:firebase-ui-firestore:3.1.2'
 
 // FirebaseUI for Firebase Auth
-implementation 'com.firebaseui:firebase-ui-auth:3.1.1'
+implementation 'com.firebaseui:firebase-ui-auth:3.1.2'
 
 // FirebaseUI for Cloud Storage
-implementation 'com.firebaseui:firebase-ui-storage:3.1.1'
+implementation 'com.firebaseui:firebase-ui-storage:3.1.2'
 }
 ```
 
@@ -96,7 +96,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
-| 3.1.1              | 11.6.2                         |
+| 3.1.2              | 11.6.2                         |
 | 3.1.0              | 11.4.2                         |
 | 3.0.0              | 11.4.2                         |
 | 2.4.0              | 11.4.0                         |
diff --git a/auth/README.md b/auth/README.md
index 8273075b9..3ce59575d 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -46,7 +46,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
 // ...
-implementation 'com.firebaseui:firebase-ui-auth:3.1.1'
+implementation 'com.firebaseui:firebase-ui-auth:3.1.2'
 
 // Required only if Facebook login support is required
 // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94
diff --git a/build.gradle b/build.gradle
index 8cb0e09ee..182ff3040 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,8 +131,7 @@ allprojects { project ->
                             dependenciesNode = asNode().appendNode("dependencies")
                         }
 
-                        // Add all that are 'compile'
-                        configurations.api.allDependencies.each {
+                        configurations.api.dependencies.each {
                             def dependencyNode = dependenciesNode.appendNode('dependency')
                             dependencyNode.appendNode('groupId', it.group)
 
@@ -143,6 +142,22 @@ allprojects { project ->
                             }
 
                             dependencyNode.appendNode('version', it.version)
+
+                            dependencyNode.appendNode('scope', 'compile')
+                        }
+                        configurations.implementation.dependencies.each {
+                            def dependencyNode = dependenciesNode.appendNode('dependency')
+                            dependencyNode.appendNode('groupId', it.group)
+
+                            if (submodules.contains(it.name)) {
+                                dependencyNode.appendNode('artifactId', "firebase-ui-${it.name}")
+                            } else {
+                                dependencyNode.appendNode('artifactId', it.name)
+                            }
+
+                            dependencyNode.appendNode('version', it.version)
+
+                            dependencyNode.appendNode('scope', 'runtime')
                         }
 
                         // Common values
diff --git a/constants.gradle b/constants.gradle
index 3c4369336..65ee3271a 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -1,7 +1,7 @@
 project.ext {
     submodules = ['database', 'auth', 'storage', 'firestore', 'common']
     group = 'com.firebaseui'
-    version = '3.1.1'
+    version = '3.1.2'
     pomdesc = 'Firebase UI Android'
 
     compileSdk = 27