From e4b20abf8ecd42a6a22313b366a7eca7e86cdce1 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 27 Mar 2020 22:41:53 -0700
Subject: [PATCH] Update gradle files

---
 app/build.gradle | 12 ++++++------
 app/res-ids.txt  |  5 -----
 build.gradle     | 13 ++-----------
 stub/.gitignore  |  1 -
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 app/res-ids.txt

diff --git a/app/build.gradle b/app/build.gradle
index 13374423e..24f9cabde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,7 +68,7 @@ dependencies {
 
     implementation 'com.github.topjohnwu:jtar:1.0.0'
     implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.6'
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.7'
 
     implementation 'io.reactivex.rxjava2:rxjava:2.2.18'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
@@ -82,7 +82,7 @@ dependencies {
     implementation "${bindingAdapter}:${vBAdapt}"
     implementation "${bindingAdapter}-recyclerview:${vBAdapt}"
 
-    def vMarkwon = '4.2.1'
+    def vMarkwon = '4.3.0'
     implementation "io.noties.markwon:core:${vMarkwon}"
     implementation "io.noties.markwon:html:${vMarkwon}"
     implementation "io.noties.markwon:image:${vMarkwon}"
@@ -97,7 +97,7 @@ dependencies {
     implementation "org.koin:koin-android:${vKoin}"
     implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
 
-    def vRetrofit = '2.7.1'
+    def vRetrofit = '2.8.1'
     implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
@@ -113,7 +113,7 @@ dependencies {
     implementation "com.squareup.moshi:moshi:${vMoshi}"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}"
 
-    def vRoom = '2.2.4'
+    def vRoom = '2.2.5'
     implementation "androidx.room:room-runtime:${vRoom}"
     implementation "androidx.room:room-rxjava2:${vRoom}"
     kapt "androidx.room:room-compiler:${vRoom}"
@@ -127,8 +127,8 @@ dependencies {
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.2'
-    implementation 'androidx.work:work-runtime:2.3.3'
+    implementation 'androidx.fragment:fragment-ktx:1.2.3'
+    implementation 'androidx.work:work-runtime:2.3.4'
     implementation 'androidx.transition:transition:1.3.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.core:core-ktx:1.2.0'
diff --git a/app/res-ids.txt b/app/res-ids.txt
deleted file mode 100644
index 3a47acfe6..000000000
--- a/app/res-ids.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-com.topjohnwu.magisk:color/xxxxxxxx = 0x7f010000
-com.topjohnwu.magisk:drawable/xxxxxxxx = 0x7f020000
-com.topjohnwu.magisk:string/xxxxxxxx = 0x7f030000
-com.topjohnwu.magisk:style/xxxxxxxx = 0x7f040000
-com.topjohnwu.magisk:xml/xxxxxxxx = 0x7f050000
diff --git a/build.gradle b/build.gradle
index 2b17ef094..c15f6e826 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,8 @@ if (configPath.exists())
     configPath.withInputStream { is -> props.load(is) }
 
 buildscript {
-    ext.vKotlin = '1.3.70'
-    ext.vNav = '2.3.0-alpha03'
+    ext.vKotlin = '1.3.71'
+    ext.vNav = '2.3.0-alpha04'
 
     repositories {
         google()
@@ -85,15 +85,6 @@ subprojects {
                 lintOptions {
                     disable 'MissingTranslation'
                 }
-
-                aaptOptions {
-                    // Handle resource IDs
-                    File resId = project.file('res-ids.txt')
-                    if (resId.exists())
-                        additionalParameters "--stable-ids", "${resId.absolutePath}"
-                    else
-                        additionalParameters "--emit-ids", "${resId.absolutePath}"
-                }
             }
         }
     }
diff --git a/stub/.gitignore b/stub/.gitignore
index b5977f73e..796b96d1c 100644
--- a/stub/.gitignore
+++ b/stub/.gitignore
@@ -1,2 +1 @@
 /build
-/res-ids.txt