Skip to content

Commit

Permalink
Task/update demo 2.3.11 (#213)
Browse files Browse the repository at this point in the history
* Update the demo with the following specs:
- Set Gradle version to 8
- Set compileSdkVersion to 34
- Set jvmTarget to 17

* addresses compilation warnings

* Migrated from the standalone Exoplayer library to androidx.media3

* removed redundant stuff
  • Loading branch information
ALexanderLonsky authored Oct 12, 2023
1 parent 7951808 commit 7616e31
Show file tree
Hide file tree
Showing 45 changed files with 352 additions and 589 deletions.
6 changes: 6 additions & 0 deletions .idea/compiler.xml

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

40 changes: 40 additions & 0 deletions .idea/jarRepositories.xml

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

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

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

3 changes: 1 addition & 2 deletions .idea/misc.xml

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

3 changes: 3 additions & 0 deletions .idea/modules.xml

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

13 changes: 0 additions & 13 deletions .idea/runConfigurations.xml

This file was deleted.

42 changes: 22 additions & 20 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,30 @@ apply plugin: "kotlin-android"
apply plugin: "kotlin-parcelize"

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.giphy.sdk.uidemo"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
}

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"
}

composeOptions {
kotlinCompilerExtensionVersion = "1.3.0"
kotlinCompilerExtensionVersion = "1.4.7"
}

namespace = "com.giphy.sdk.uidemo"

buildFeatures {
viewBinding = true
compose = true
Expand All @@ -49,25 +51,25 @@ android {

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10"
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
implementation "com.google.android.material:material:1.1.0"
implementation "com.giphy.sdk:ui:2.3.10"
implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")
implementation("com.google.android.exoplayer:exoplayer-ui:2.18.1")
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "com.google.android.material:material:1.9.0"
implementation "com.giphy.sdk:ui:2.3.11"
implementation("androidx.media3:media3-exoplayer:1.1.1")
implementation("androidx.media3:media3-ui:1.1.1")
implementation 'com.github.bumptech.glide:glide:4.12.0'
implementation "com.squareup.leakcanary:leakcanary-android:2.7"
implementation "com.github.savvyapps:ToggleButtonLayout:1.2.0"
implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")

// Jetpack Compose
implementation("androidx.compose.material:material:1.3.1")
implementation("androidx.compose.ui:ui:1.3.3")
implementation("androidx.compose.ui:ui-tooling:1.3.3")
implementation("androidx.compose.ui:ui-viewbinding:1.3.3")
implementation("androidx.compose.foundation:foundation:1.3.1")
implementation("androidx.compose.runtime:runtime-livedata:1.3.3")
implementation 'androidx.activity:activity-compose:1.6.1'
implementation("androidx.compose.material:material:1.5.2")
implementation("androidx.compose.ui:ui:1.5.2")
implementation("androidx.compose.ui:ui-tooling:1.5.2")
implementation("androidx.compose.ui:ui-viewbinding:1.5.2")
implementation("androidx.compose.foundation:foundation:1.5.2")
implementation("androidx.compose.runtime:runtime-livedata:1.5.2")
implementation 'androidx.activity:activity-compose:1.7.2'
}
105 changes: 0 additions & 105 deletions app/src/androidTest/java/GiphyDialogFragmentTest.kt

This file was deleted.

104 changes: 0 additions & 104 deletions app/src/androidTest/java/GridViewGifTest.kt

This file was deleted.

Loading

0 comments on commit 7616e31

Please sign in to comment.