Merge pull request #259 from fishballzzz/258.timeline

258.timeline
yudanhezhongweijie · Apr 18, 2021 · 2278901 · 2278901
2 parents 6f7596f + 1c1a894
commit 2278901
Show file tree

Hide file tree

Showing 27 changed files with 1,203 additions and 194 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,20 +44,20 @@ android {
         }
     }
 
-    compileSdkVersion 29
+    compileSdkVersion 30
 //    buildToolsVersion "29.0.3"
     android.ndkVersion "21.1.6352462"
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 
     defaultConfig {
         applicationId "com.laotoua.dawnislandk"
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 46
-        versionName "v1.3.53"
+        targetSdkVersion 30
+        versionCode 47
+        versionName "v1.3.55"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -122,22 +122,22 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.activity:activity-ktx:1.3.0-alpha03"
-    implementation "androidx.fragment:fragment-ktx:1.3.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.3.0-alpha06"
+    implementation "androidx.fragment:fragment-ktx:1.3.2"
 
-    def lifecycle_version = "2.3.0"
+    def lifecycle_version = "2.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
 
-    implementation 'com.google.android.material:material:1.4.0-alpha01'
+    implementation 'com.google.android.material:material:1.4.0-alpha02'
 
-    def appcompat_version = "1.3.0-beta01"
+    def appcompat_version = "1.3.0-rc01"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
 
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
@@ -191,7 +191,7 @@ dependencies {
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
 
-    def nav_version = "2.3.3"
+    def nav_version = "2.3.5"
     // Kotlin navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"