From 7d8810ff8cede0022205ff92b282f3a6a21868fe Mon Sep 17 00:00:00 2001 From: Alexander Hoffmann Date: Fri, 15 Oct 2021 13:40:44 +0500 Subject: [PATCH 1/4] Migrate exoplayer version --- app/build.gradle | 2 +- .../com/github/ashutoshgngwr/noice/ext/SimpleExoPlayerExt.kt | 2 +- build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5e0c26eb5..09349ba38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,8 +115,8 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'com.github.AppIntro:AppIntro:6.1.0' implementation 'io.github.medyo:android-about-page:2.0.0' - implementation 'com.google.android.exoplayer:exoplayer-core:2.11.8' implementation 'com.google.android:flexbox:2.0.1' + implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3' implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.code.gson:gson:2.8.8' implementation 'com.hopenlib.library:flextools:1.0.1' diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/ext/SimpleExoPlayerExt.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/ext/SimpleExoPlayerExt.kt index 4b9499f6f..2215ba9c8 100644 --- a/app/src/main/java/com/github/ashutoshgngwr/noice/ext/SimpleExoPlayerExt.kt +++ b/app/src/main/java/com/github/ashutoshgngwr/noice/ext/SimpleExoPlayerExt.kt @@ -75,6 +75,6 @@ fun SimpleExoPlayer.setAudioAttributesCompat(compatAttrs: AudioAttributesCompat) .build() if (attrs != audioAttributes) { - audioAttributes = attrs + setAudioAttributes(attrs, false) } } diff --git a/build.gradle b/build.gradle index c60e0f971..401497ac8 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { allprojects { repositories { google() - jcenter() // TODO: replace it with maven central by the end of the year 2021. + mavenCentral() maven { url "https://jitpack.io" } } } From b4155e8d44e7668310a82fad363edc633aefa1e8 Mon Sep 17 00:00:00 2001 From: Alexander Hoffmann Date: Fri, 15 Oct 2021 13:41:17 +0500 Subject: [PATCH 2/4] Migrate flexbox and flextools to new version --- app/build.gradle | 4 ++-- app/src/main/res/layout/random_preset_fragment.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 09349ba38..1d9eaf09a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,11 +115,11 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'com.github.AppIntro:AppIntro:6.1.0' implementation 'io.github.medyo:android-about-page:2.0.0' - implementation 'com.google.android:flexbox:2.0.1' implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3' + implementation 'com.google.android.flexbox:flexbox:2.0.1' implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.code.gson:gson:2.8.8' - implementation 'com.hopenlib.library:flextools:1.0.1' + implementation 'io.github.mrherintsoahasina:flextools:1.0.3' implementation 'com.ncorti:slidetoact:0.9.0' implementation 'io.noties.markwon:core:4.6.2' implementation 'org.greenrobot:eventbus:3.1.1' diff --git a/app/src/main/res/layout/random_preset_fragment.xml b/app/src/main/res/layout/random_preset_fragment.xml index 662396cd0..42f5bff26 100644 --- a/app/src/main/res/layout/random_preset_fragment.xml +++ b/app/src/main/res/layout/random_preset_fragment.xml @@ -40,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="8dp" /> - - + - - + Date: Fri, 15 Oct 2021 14:54:18 +0500 Subject: [PATCH 3/4] Add constraint for transitive dependency com.jraska:falcon --- app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 1d9eaf09a..847cdc4ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -154,6 +154,12 @@ dependencies { androidTestImplementation "junit:junit:$junitVersion" androidTestFullImplementation 'tools.fastlane:screengrab:2.1.0' + // Constraint can be removed once https://github.com/fastlane/fastlane/issues/19480 is resolved + constraints { + implementation('com.jraska:falcon:2.2.0') { + because 'Versions before 2.2.0 are only available on the now deprecated jcenter repository' + } + } debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion" } From ee1968fb56c7a78b5214aebfc23c61bf2b0dc853 Mon Sep 17 00:00:00 2001 From: Alexander Hoffmann Date: Sun, 17 Oct 2021 17:09:02 +0500 Subject: [PATCH 4/4] Update screengrab to v2.1.1 --- app/build.gradle | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 847cdc4ba..63d3ed277 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,13 +153,7 @@ dependencies { androidTestImplementation "io.mockk:mockk-android:$mockkVersion" androidTestImplementation "junit:junit:$junitVersion" - androidTestFullImplementation 'tools.fastlane:screengrab:2.1.0' - // Constraint can be removed once https://github.com/fastlane/fastlane/issues/19480 is resolved - constraints { - implementation('com.jraska:falcon:2.2.0') { - because 'Versions before 2.2.0 are only available on the now deprecated jcenter repository' - } - } + androidTestFullImplementation 'tools.fastlane:screengrab:2.1.1' debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion" }