Skip to content

Commit

Permalink
Merge pull request #2780 from mikepenz/feature/dependency_upgrades_20…
Browse files Browse the repository at this point in the history
…220624

Upgrade dependencies 2022.06.24
  • Loading branch information
mikepenz committed Jun 24, 2022
2 parents 53a4f4a + fd16212 commit de8bfb9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
6 changes: 4 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@ dependencies {
implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
implementation "androidx.cardview:cardview:${versions.cardview}"
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
implementation "androidx.slidingpanelayout:slidingpanelayout:${versions.slidingpaneLayout}"
implementation("androidx.slidingpanelayout:slidingpanelayout:${versions.slidingpaneLayout}") {
force true
}
implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"

// used to showcase how to load images
implementation("io.coil-kt:coil:1.4.0")
implementation('io.coil-kt:coil:2.1.0')

// the sample uses more advanced functions of the fastadapter
// https://github.com/mikepenz/FastAdapter/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable
import android.net.Uri
import android.widget.ImageView
import androidx.multidex.MultiDexApplication
import coil.clear
import coil.dispose
import coil.load
import com.google.android.material.color.DynamicColors
import com.mikepenz.iconics.Iconics
Expand Down Expand Up @@ -50,7 +50,7 @@ class CustomApplication : MultiDexApplication() {
}

override fun cancel(imageView: ImageView) {
imageView.clear()
imageView.dispose()
}

override fun placeholder(ctx: Context, tag: String?): Drawable {
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ buildscript {
annotation : '1.1.0',
recyclerView : '1.2.1',
core : '1.7.0',
material : '1.5.0',
appcompat : '1.4.1',
material : '1.6.1',
appcompat : '1.4.2',
drawerlayout : '1.1.1',
constraintLayout : '2.1.3',
constraintLayout : '2.1.4',
cardview : '1.0.0',
kotlin : "1.6.20",
kotlin : "1.7.0",
fastadapter : "5.6.0",
iconics : "5.3.3",
aboutLibs : "10.1.0",
aboutLibs : "10.3.1",
navigation : "2.4.2",
detekt : '1.18.1',
slidingpaneLayout : "1.1.0", // no plans to upgrade to 1.2.0 anymore
Expand All @@ -41,7 +41,7 @@ buildscript {
mavenLocal()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit de8bfb9

Please sign in to comment.