Merge remote-tracking branch 'origin/dev' into dev

maxrave-dev · Sep 11, 2023 · f857d46 · f857d46
2 parents 0b6edee + 89ef23a
commit f857d46
Show file tree

Hide file tree

Showing 125 changed files with 1,213 additions and 3,735 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id ("com.android.application")
     id ("org.jetbrains.kotlin.android")
     id ("androidx.navigation.safeargs")
+    id ("kotlin-kapt")
     id ("com.google.dagger.hilt.android")
     id("com.google.devtools.ksp")
 }
@@ -14,8 +15,8 @@ android {
         applicationId = "com.maxrave.simpmusic"
         minSdk = 26
         targetSdk = 34
-        versionCode = 9
-        versionName = "0.1.3-beta"
+        versionCode = 8
+        versionName = "0.1.2-beta"
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
@@ -51,18 +52,18 @@ android {
 
 dependencies {
 
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
+    implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
     //material design3
     implementation("com.google.android.material:material:1.9.0")
     //runtime
     implementation("androidx.startup:startup-runtime:1.1.1")
     implementation(project(mapOf("path" to ":kotlinYtmusicScraper")))
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     //ExoPlayer
-    val media3_version= "1.1.1"
+    val media3_version= "1.1.0"
 
     implementation("androidx.media3:media3-exoplayer:$media3_version")
     implementation("androidx.media3:media3-ui:$media3_version")
@@ -93,15 +94,15 @@ dependencies {
     //Coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
     //Navigation
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.2")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.2")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.7.0")
+    implementation("androidx.navigation:navigation-ui-ktx:2.7.0")
 
     implementation("com.google.code.gson:gson:2.10.1")
 
     //Coil
     implementation("io.coil-kt:coil:2.4.0")
     //Glide
-    implementation("com.github.bumptech.glide:glide:4.16.0")
+    implementation("com.github.bumptech.glide:glide:4.15.1")
     //Easy Permissions
     implementation("pub.devrel:easypermissions:3.0.0")
     //Palette Color
@@ -113,8 +114,8 @@ dependencies {
     //fragment ktx
     implementation("androidx.fragment:fragment-ktx:1.6.1")
     //Hilt
-    implementation("com.google.dagger:hilt-android:2.48")
-    ksp("com.google.dagger:hilt-compiler:2.48")
+    implementation("com.google.dagger:hilt-android:2.47")
+    kapt("com.google.dagger:hilt-compiler:2.47")
     ksp("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
     //DataStore
     implementation("androidx.datastore:datastore-preferences:1.0.0")
@@ -132,16 +133,20 @@ dependencies {
     implementation("com.airbnb.android:lottie:$lottieVersion")
 
     //Paging 3
-    val paging_version= "3.2.1"
+    val paging_version= "3.2.0"
     implementation("androidx.paging:paging-runtime-ktx:$paging_version")
 
     implementation("com.daimajia.swipelayout:library:1.2.0@aar")
 
-
-    //Custom Activity On Crash
-    implementation ("cat.ereza:customactivityoncrash:2.4.0")
+    //arca
+    val acraVersion = "5.11.0"
+    implementation("ch.acra:acra-mail:$acraVersion")
 
 
+}
+// Allow references to generated code
+kapt {
+    correctErrorTypes = true
 }
 hilt {
     enableAggregatingTask = true

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 9,
-      "versionName": "0.1.3-beta",
+      "versionCode": 8,
+      "versionName": "0.1.2-beta",
       "outputFile": "app-release.apk"
     }
   ],