Skip to content

Commit

Permalink
chore: update some tools/deps (#92)
Browse files Browse the repository at this point in the history
  • Loading branch information
daytime-em authored Oct 27, 2023
1 parent 47f6707 commit 161b4aa
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
21 changes: 10 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ plugins {

android {
namespace "com.mux.video.vod.demo"
compileSdk 33
compileSdk 34

defaultConfig {
applicationId "com.mux.video.vod.demo"
minSdk 21
targetSdk 33
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -38,7 +37,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.8'
kotlinCompilerExtensionVersion '1.5.3'
}
packagingOptions {
resources {
Expand All @@ -52,23 +51,23 @@ dependencies {
implementation project(':library')

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.10.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.activity:activity-ktx:1.7.2'
implementation "androidx.fragment:fragment-ktx:1.6.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.activity:activity-ktx:1.8.0'
implementation "androidx.fragment:fragment-ktx:1.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'net.danlew:android.joda:2.12.5'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$compose_ui_version"
implementation "androidx.compose.material:material-icons-extended:$compose_ui_version"
implementation "com.google.accompanist:accompanist-systemuicontroller:0.30.1"

implementation 'androidx.compose.material:material:1.4.3'
implementation 'androidx.compose.material:material:1.5.4'

implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"
implementation "com.squareup.okhttp3:okhttp:4.11.0"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext {
compose_ui_version = '1.4.3'
compose_ui_version = '1.5.3'
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
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.22' apply false
id 'com.android.application' version '8.1.2' apply false
id 'com.android.library' version '8.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
id 'com.mux.gradle.android.mux-android-distribution' version '1.1.2' apply false
}
3 changes: 1 addition & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ plugins {

android {
namespace 'com.mux.video.upload'
compileSdk 33
compileSdk 34

defaultConfig {
minSdk 16
targetSdk 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand Down

0 comments on commit 161b4aa

Please sign in to comment.