diff --git a/app/build.gradle b/app/build.gradle index 8637723..151b5e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,12 +47,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures { @@ -64,8 +64,8 @@ dependencies { implementation fileTree(dir: "libs", include: ["extension-*.aar"]) implementation project(path: ":mpv") - def exoplayer_version = "2.18.5" - def moshi_version = "1.14.0" + def exoplayer_version = "2.18.7" + def moshi_version = '1.15.0' def retrofit_version = "2.9.0" def room_version = "2.5.1" @@ -108,24 +108,24 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" // Coroutines - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1" // Dagger hilt - implementation "com.google.dagger:hilt-android:2.45" - kapt "com.google.dagger:hilt-compiler:2.45" + implementation 'com.google.dagger:hilt-android:2.46.1' + kapt 'com.google.dagger:hilt-compiler:2.46.1' // Splash - implementation "androidx.core:core-splashscreen:1.0.0" + implementation "androidx.core:core-splashscreen:1.0.1" // Navigational Components - implementation "androidx.navigation:navigation-fragment-ktx:2.5.3" - implementation "androidx.navigation:navigation-ui-ktx:2.5.3" + implementation "androidx.navigation:navigation-fragment-ktx:2.6.0" + implementation "androidx.navigation:navigation-ui-ktx:2.6.0" //Kotlin - implementation "androidx.core:core-ktx:1.9.0" + implementation "androidx.core:core-ktx:1.10.1" implementation "androidx.appcompat:appcompat:1.6.1" - implementation "com.google.android.material:material:1.8.0" + implementation "com.google.android.material:material:1.9.0" implementation "androidx.constraintlayout:constraintlayout:2.1.4" testImplementation "junit:junit:4.13.2" diff --git a/build.gradle b/build.gradle index 08f3427..0c418eb 100644 --- a/build.gradle +++ b/build.gradle @@ -6,14 +6,14 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0" classpath "com.google.dagger:hilt-android-gradle-plugin:2.45" } } plugins { - id "com.android.application" version "7.4.2" apply false - id "com.android.library" version "7.4.2" apply false + id "com.android.application" version "8.0.2" apply false + id "com.android.library" version "8.0.2" apply false id "org.jetbrains.kotlin.android" version "1.8.10" apply false } diff --git a/gradle.properties b/gradle.properties index cd0519b..022338b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3dd6b5d..b1feb95 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Jun 13 19:40:13 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/mpv/build.gradle b/mpv/build.gradle index b8c64d5..339ff78 100644 --- a/mpv/build.gradle +++ b/mpv/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.library' - id 'org.jetbrains.kotlin.android' + id "com.android.library" + id "org.jetbrains.kotlin.android" } android { @@ -13,18 +13,23 @@ android { targetSdk 33 } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { - jvmTarget = '1.8' + jvmTarget = "17" } sourceSets { main { - jniLibs.srcDirs = ['./src/main/libs'] + jniLibs.srcDirs = ["./src/main/libs"] } } } dependencies { - implementation "androidx.annotation:annotation:1.5.0" + implementation "androidx.annotation:annotation:1.6.0" } \ No newline at end of file