Update Glide which fixes the in-process compilation for CI

proxer · Dec 3, 2017 · e14e257 · e14e257
1 parent 418cb48
commit e14e257
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -66,7 +66,7 @@ ext {
     // Utils
     threetenVersion = '1.0.5'
     hawkVersion = '2.0.1'
-    glideVersion = '4.3.1'
+    glideVersion = '4.4.0-SNAPSHOT'
     okHttpVersion = '3.9.1'
     okioVersion = '1.13.0'
     linkBuilderVersion = '1.6.1'

diff --git a/src/main/kotlin/me/proxer/app/ProxerGlideModule.kt b/src/main/kotlin/me/proxer/app/ProxerGlideModule.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import com.bumptech.glide.Glide
 import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.Excludes
 import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.integration.okhttp3.OkHttpLibraryGlideModule
 import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
 import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.module.AppGlideModule
@@ -16,6 +18,7 @@ import java.io.InputStream
  * @author Ruben Gees
  */
 @GlideModule
+@Excludes(OkHttpLibraryGlideModule::class)
 class ProxerGlideModule : AppGlideModule() {
 
     override fun registerComponents(context: Context, glide: Glide, registry: Registry) {