Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ plugins {
}

android {
compileSdk 31
compileSdk 33

defaultConfig {
applicationId "dev.vaibhav.musicx"
minSdk 26
targetSdk 31
targetSdk 33
versionCode 2
versionName "1.0.2"

Expand All @@ -34,7 +34,7 @@ android {
}
kotlinOptions {
jvmTarget = '1.8'
useIR = true
// useIR = true
}
buildFeatures {
compose true
Expand All @@ -52,23 +52,23 @@ android {

dependencies {

implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.6.1'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
implementation 'androidx.activity:activity-compose:1.4.0'
testImplementation 'junit:junit:4.+'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.activity:activity-compose:1.6.0'
testImplementation 'junit:junit:'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation "androidx.compose.material3:material3:$compose_m3_version"

//navigation
implementation "androidx.navigation:navigation-compose:2.4.0-rc01"
implementation "androidx.navigation:navigation-compose:2.6.0-alpha02"

//coil
implementation "io.coil-kt:coil-compose:1.4.0"
Expand All @@ -90,12 +90,12 @@ dependencies {
//firebase
implementation platform('com.google.firebase:firebase-bom:29.0.3')
implementation 'com.google.firebase:firebase-firestore-ktx'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4"

//hilt
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0-rc01'
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'

//exoplayer
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
Expand All @@ -117,7 +117,7 @@ dependencies {
//unit testing
kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
testImplementation "com.google.truth:truth:$google_truth_version"
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
testImplementation "app.cash.turbine:turbine:$turbine_version"
// testImplementation "io.mockk:mockk:$mockK_version"
// testImplementation "io.mockk:mockk-agent-jvm:$mockK_version"
Expand All @@ -126,7 +126,7 @@ dependencies {
kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version"
androidTestImplementation "com.google.truth:truth:$google_truth_version"
androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
androidTestImplementation "app.cash.turbine:turbine:$turbine_version"
androidTestImplementation "io.mockk:mockk-android:$mockK_version"
androidTestImplementation "io.mockk:mockk-agent-android:$mockK_version"
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
compose_version = '1.0.5'
compose_version = '1.2.1'
compose_m3_version = "1.0.0-alpha02"
kotlin_version = '1.5.31'
hilt_version = '2.38.1'
exoplayer_version = '2.16.1'
room_version = '2.4.0'
accompanist_version = '0.22.0-rc'
kotlin_version = '1.7.20'
hilt_version = '2.40.1'
exoplayer_version = '2.18.1'
room_version = '2.4.3'
accompanist_version = '0.26.5-rc'
google_truth_version = "1.1.3"
retrofit_version = "2.9.0"
turbine_version = "0.7.0"
mockK_version = "1.12.2"
turbine_version = "0.11.0"
mockK_version = "1.13.2"
}
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.4"
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.gms:google-services:4.3.14'
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Dec 17 16:02:44 IST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME