Browse Source

Merge branch 'housekeeping/update-agp-7-0-2' into 'develop'

Upgrade Android Gradle Plugin to version 7.0.2

See merge request funkwhale/funkwhale-android!86
bugfix/46-adjust-now-playing-top-margin
Ryan Harg 3 years ago
parent
commit
4e0279a75a
  1. 1
      app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
  2. 1
      app/src/main/java/audio/funkwhale/ffa/koin/Modules.kt
  3. 2
      build.gradle.kts

1
app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt

@ -175,7 +175,6 @@ class PlaylistTracksFragment : FFAFragment<PlaylistTrack, PlaylistTracksAdapter> @@ -175,7 +175,6 @@ class PlaylistTracksFragment : FFAFragment<PlaylistTrack, PlaylistTracksAdapter>
else -> RoundedCornersTransformation.CornerType.TOP_LEFT
}
lifecycleScope.launch(Main) {
Picasso.get()
.maybeLoad(maybeNormalizeUrl(url))

1
app/src/main/java/audio/funkwhale/ffa/koin/Modules.kt

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
package audio.funkwhale.ffa.koin
import android.content.Context
import audio.funkwhale.ffa.R
import audio.funkwhale.ffa.playback.CacheDataSourceFactoryProvider
import audio.funkwhale.ffa.playback.MediaSession
import audio.funkwhale.ffa.utils.AuthorizationServiceFactory

2
build.gradle.kts

@ -7,7 +7,7 @@ buildscript { @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:7.0.1")
classpath("com.android.tools.build:gradle:7.0.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath("com.github.bjoernq:unmockplugin:${Versions.unmock}")
classpath("com.github.ben-manes:gradle-versions-plugin:${Versions.gradleDependencyPlugin}")

Loading…
Cancel
Save