diff --git a/app/build.gradle b/app/build.gradle index d9ba075..2f7de43 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,8 @@ plugins { id 'kotlin-android' } + + android { @@ -32,6 +34,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + buildFeatures { + compose true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -54,8 +61,8 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version - kotlinCompilerVersion '1.5.21' + kotlinCompilerExtensionVersion = "1.1.1" + //kotlinCompilerVersion '1.6.10' } packagingOptions { exclude 'META-INF/*' @@ -70,24 +77,27 @@ 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.8.0' + implementation 'androidx.appcompat:appcompat:1.5.0' + 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.compose.material:material-icons-extended:$compose_version" implementation "androidx.compose.runtime:runtime-livedata:$compose_version" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0' - implementation 'androidx.activity:activity-compose:1.4.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.0' + implementation "androidx.navigation:navigation-compose:2.5.1" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation 'androidx.activity:activity-compose:1.5.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3' implementation 'su.litvak.chromecast:api-v2:0.11.3' - implementation("io.coil-kt:coil-compose:1.4.0") + implementation 'com.beust:klaxon:5.6' + implementation("io.coil-kt:coil-compose:2.1.0") implementation "com.google.accompanist:accompanist-swiperefresh:0.22.0-rc" - implementation 'com.github.yausername.youtubedl-android:library:0.13.+' - implementation 'com.github.yausername.youtubedl-android:ffmpeg:0.13.+' - implementation "androidx.media:media:1.4.3" + implementation "com.google.accompanist:accompanist-pager:0.24.0-alpha" + implementation 'com.github.yausername.youtubedl-android:library:-SNAPSHOT' + implementation 'com.github.yausername.youtubedl-android:ffmpeg:-SNAPSHOT' + implementation "androidx.media:media:1.6.0" implementation 'io.ktor:ktor-server-core:1.6.2' implementation 'io.ktor:ktor-server-jetty:1.6.2' diff --git a/build.gradle b/build.gradle index df033c6..42ac7e0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - compose_version = '1.0.1' + compose_version = '1.2.1' + kotlin_version = '1.6.10' } repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:7.0.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files