Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-09 19:10:42 +00:00
Code Issues Releases Wiki Activity

No issue: Upgrade to stable Navigation library and ignore ktlint issues in generated code

Browse Source
This commit is contained in:
Colin Lee 2019-03-14 22:47:48 -05:00 committed by Jeff Boek
parent 8620b78d6a
commit 72b9d4ebdb
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -6,7 +6,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply from: "$project.rootDir/automation/gradle/versionCode.gradle" apply from: "$project.rootDir/automation/gradle/versionCode.gradle"
apply plugin: 'androidx.navigation.safeargs' apply plugin: 'androidx.navigation.safeargs.kotlin'
apply plugin: 'org.mozilla.appservices' apply plugin: 'org.mozilla.appservices'

2
build.gradle
View File

@ -61,7 +61,7 @@ configurations {
} }
dependencies { dependencies {
ktlint "com.github.shyiko:ktlint:0.24.0" ktlint "com.github.shyiko:ktlint:0.31.0"
} }
task ktlint(type: JavaExec, group: "verification") { task ktlint(type: JavaExec, group: "verification") {

5
buildSrc/src/main/java/Dependencies.kt
View File

@ -20,8 +20,7 @@ private object Versions {
const val androidx_annotation = "1.1.0-alpha02" const val androidx_annotation = "1.1.0-alpha02"
const val androidx_lifecycle = "2.1.0-alpha03" const val androidx_lifecycle = "2.1.0-alpha03"
const val androidx_fragment = "1.1.0-alpha05" const val androidx_fragment = "1.1.0-alpha05"
const val androidx_safeargs = "1.0.0-beta01" const val androidx_navigation = "2.0.0"
const val androidx_navigation = "2.0.0-rc02"
const val appservices_gradle_plugin = "0.3.1" const val appservices_gradle_plugin = "0.3.1"
const val mozilla_android_components = "0.47.0-SNAPSHOT" 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_legacy = "androidx.legacy:legacy-support-v4:${Versions.androidx_legacy}"
const val androidx_lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime:${Versions.androidx_lifecycle}" 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_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_fragment = "androidx.navigation:navigation-fragment:${Versions.androidx_navigation}"
const val androidx_navigation_ui = "androidx.navigation:navigation-ui:${Versions.androidx_navigation}" const val androidx_navigation_ui = "androidx.navigation:navigation-ui:${Versions.androidx_navigation}"