From 72b9d4ebdb3f9d9baeb849b3933efdd6eb915cf7 Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Thu, 14 Mar 2019 22:47:48 -0500
Subject: [PATCH] No issue: Upgrade to stable Navigation library and ignore
 ktlint issues in generated code

---
 app/build.gradle                       | 2 +-
 build.gradle                           | 2 +-
 buildSrc/src/main/java/Dependencies.kt | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49a665ce7c..98af8fffe2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply from: "$project.rootDir/automation/gradle/versionCode.gradle"
-apply plugin: 'androidx.navigation.safeargs'
+apply plugin: 'androidx.navigation.safeargs.kotlin'
 
 apply plugin: 'org.mozilla.appservices'
 
diff --git a/build.gradle b/build.gradle
index 074aca6ed5..7335d18c6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,7 +61,7 @@ configurations {
 }
 
 dependencies {
-    ktlint "com.github.shyiko:ktlint:0.24.0"
+    ktlint "com.github.shyiko:ktlint:0.31.0"
 }
 
 task ktlint(type: JavaExec, group: "verification") {
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 2c0a6c5762..6144fd8600 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -20,8 +20,7 @@ private object Versions {
     const val androidx_annotation = "1.1.0-alpha02"
     const val androidx_lifecycle = "2.1.0-alpha03"
     const val androidx_fragment = "1.1.0-alpha05"
-    const val androidx_safeargs = "1.0.0-beta01"
-    const val androidx_navigation = "2.0.0-rc02"
+    const val androidx_navigation = "2.0.0"
 
     const val appservices_gradle_plugin = "0.3.1"
     const val mozilla_android_components = "0.47.0-SNAPSHOT"
@@ -124,7 +123,7 @@ object Deps {
     const val androidx_legacy = "androidx.legacy:legacy-support-v4:${Versions.androidx_legacy}"
     const val androidx_lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime:${Versions.androidx_lifecycle}"
     const val androidx_preference = "androidx.preference:preference-ktx:${Versions.androidx_preference}"
-    const val androidx_safeargs = "android.arch.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_safeargs}"
+    const val androidx_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}"
     const val androidx_navigation_fragment = "androidx.navigation:navigation-fragment:${Versions.androidx_navigation}"
     const val androidx_navigation_ui = "androidx.navigation:navigation-ui:${Versions.androidx_navigation}"