From 2037b0da779c48023203a0a9185e28d9e491ecd1 Mon Sep 17 00:00:00 2001 From: David Carver Date: Sun, 15 Dec 2024 17:58:35 -0500 Subject: [PATCH] chore: Migrate to KSP for Glide and Toothpick --- build.gradle | 3 ++- emby-lib/build.gradle.kts | 6 ++++-- gradle/libs.versions.toml | 6 +++++- serenity-android-common/build.gradle.kts | 5 +++-- serenity-app/build.gradle.kts | 8 +++++--- .../serenity/GalleryOnItemSelectedListener.kt | 3 ++- .../serenity/core/RecommendationBuilder.java | 5 +++-- .../serenity/core/model/impl/MenuMediaContainer.java | 4 ++-- .../MainMenuVideoContentVerticalGridFragment.kt | 4 ++-- .../nineworlds/serenity/jobs/GlideClearCacheJob.java | 6 +++--- .../serenity/ui/leanback/search/CardPresenter.kt | 4 ++-- .../ui/leanback/search/MovieSearchFragment.java | 9 +++++---- .../AbstractVideoOnItemSelectedListener.java | 4 ++-- .../statusoverlayview/StatusOverlayFrameLayout.java | 5 +++-- .../viewholders/AbstractPosterImageViewHolder.java | 4 ++-- .../ui/activity/leanback/details/DetailsFragment.kt | 11 ++--------- .../serenity/ui/activity/login/LoginUserViewHolder.kt | 4 ++-- .../ui/leanback/presenters/CategoryVideoPresenter.kt | 1 - .../ui/leanback/presenters/EpisodeVideoPresenter.kt | 4 ++-- .../leanback/presenters/MoviePresenterViewHolder.kt | 4 ++-- .../leanback/presenters/SeriesPresenterViewHolder.kt | 5 ++--- .../serenity/ui/util/ImageInfographicUtils.kt | 4 ++-- serenity-common/build.gradle.kts | 1 - 23 files changed, 57 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index a0412255b..a38f936a7 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ buildscript { plugins { id "com.diffplug.spotless" version "6.18.0" + id 'com.google.devtools.ksp' version "1.9.25-1.0.20" apply false } repositories { @@ -60,7 +61,7 @@ subprojects { } } - tasks.withType(Test) { + tasks.withType(Test).configureEach { testLogging { exceptionFormat = "full" diff --git a/emby-lib/build.gradle.kts b/emby-lib/build.gradle.kts index c182cc071..b5b51b30d 100644 --- a/emby-lib/build.gradle.kts +++ b/emby-lib/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("com.android.library") kotlin("android") kotlin("kapt") + id("com.google.devtools.ksp") } android { @@ -63,7 +64,8 @@ dependencies { debugImplementation(libs.toothpick.smoothie) releaseApi(libs.toothpick.javax.annotations) - kapt(libs.toothpick.compiler) +// kapt(libs.toothpick.compiler) + ksp(libs.toothpick.ksp.compiler) implementation(libs.android.priority.jobqueue) implementation(libs.eventbus) @@ -89,5 +91,5 @@ dependencies { testImplementation(libs.kotlin.coroutines.test) testImplementation(libs.toothpick.testing) - kaptTest(libs.toothpick.compiler) + kspTest(libs.toothpick.ksp.compiler) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec1e9de1c..aff391784 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,9 @@ fragmentKtxVersion = "1.8.5" glide = "4.12.0" junit = "1.2.1" juniversalchardetVersion = "1.0.3" -kotlinVersion = "1.9.24" +kotlinVersion = "1.9.25" kotlinCoroutinesVersion = "1.7.3" +kotlinKSPVersion = "1.9.25-1.0.20" androidPluginVersion = "8.7.3" leanbackPreferenceVersion = "1.1.0-rc01" leanbackVersion = "1.1.0-rc02" @@ -48,6 +49,7 @@ robolectricVersion = "4.14.1" openglApiVersion = "gl1.1-android-2.1_r1" assertJAndroidVersion = "1.1.1" toothPickVersion = "3.1.0" +toothPickKspVersion = "1.1.0" easydeviceInfoVersion = "2.4.1" androidxTestCoreVersion = "1.6.1" @@ -111,8 +113,10 @@ simple-xml = { group = "org.simpleframework", name = "simple-xml", version.ref = toothpick-runtime = { group = "com.github.stephanenicolas.toothpick", name = "toothpick-runtime", version.ref = "toothPickVersion"} toothpick-smoothie = { group = "com.github.stephanenicolas.toothpick", name = "smoothie", version.ref = "toothPickVersion" } toothpick-compiler = { group = "com.github.stephanenicolas.toothpick", name = "toothpick-compiler", version.ref = "toothPickVersion" } +toothpick-ksp-compiler = { group = "com.github.bedrockstreaming.toothpick-ksp", name = "compiler", version.ref = "toothPickKspVersion" } toothpick-javax-annotations = { group = "com.github.stephanenicolas.toothpick", name = "toothpick-javax-annotations", version.ref = "toothPickVersion" } + # Tests junit = { group = "junit", name = "junit", version.ref = "junitVersion" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertjVersion" } diff --git a/serenity-android-common/build.gradle.kts b/serenity-android-common/build.gradle.kts index 28d8998ff..b84e3b9ae 100644 --- a/serenity-android-common/build.gradle.kts +++ b/serenity-android-common/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("com.android.library") kotlin("android") kotlin("kapt") + id("com.google.devtools.ksp") } android { @@ -55,7 +56,7 @@ dependencies { debugApi(libs.toothpick.smoothie) releaseApi(libs.toothpick.javax.annotations) - kapt(libs.toothpick.compiler) + ksp(libs.toothpick.ksp.compiler) testImplementation(libs.junit) testImplementation(libs.assertj.core) @@ -67,5 +68,5 @@ dependencies { testImplementation(libs.opengl.api) testImplementation(libs.toothpick.testing) - kaptTest(libs.toothpick.compiler) + kspTest(libs.toothpick.ksp.compiler) } diff --git a/serenity-app/build.gradle.kts b/serenity-app/build.gradle.kts index b4e843f38..e037df8c8 100644 --- a/serenity-app/build.gradle.kts +++ b/serenity-app/build.gradle.kts @@ -9,6 +9,7 @@ plugins { id("org.sonarqube") id("com.google.firebase.crashlytics") id("com.google.gms.google-services") version "4.4.0" + id("com.google.devtools.ksp") } apply(from = "../jacoco.gradle") @@ -145,7 +146,7 @@ dependencies { implementation(libs.moxy.community.moxy.app.compat) implementation(libs.moxy.ktx) implementation(libs.github.glide) - kapt(libs.glide.compiler) + ksp(libs.glide.compiler) implementation(libs.android.priority.jobqueue) implementation(libs.androidx.appcompat) implementation(libs.androidx.leanback) @@ -172,7 +173,7 @@ dependencies { debugImplementation(libs.toothpick.runtime) releaseImplementation(libs.toothpick.javax.annotations) - kapt(libs.toothpick.compiler) + ksp(libs.toothpick.ksp.compiler) implementation(libs.moshi) implementation(libs.retrofit.moshi) @@ -218,7 +219,8 @@ dependencies { testImplementation(libs.opengl.api) testImplementation(libs.androidx.junit) - kaptTest(libs.toothpick.compiler) +// kaptTest(libs.toothpick.compiler) + kspTest(libs.toothpick.ksp.compiler) kapt(libs.moxy.compiler) } diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt b/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt index e6e11aef1..30188d134 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt +++ b/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt @@ -32,6 +32,7 @@ import android.view.View import android.view.animation.AnimationUtils import android.widget.ImageView import androidx.core.content.ContextCompat +import com.bumptech.glide.Glide import us.nineworlds.serenity.core.menus.MenuItem import us.nineworlds.serenity.fragments.mainmenu.MainMenuPresenter import javax.inject.Provider @@ -90,7 +91,7 @@ class GalleryOnItemSelectedListener(private val adapter: MainMenuTextViewAdapter if (hasFocus && view != null) { mainGalleryBackgroundView = context.findViewById(R.id.mainGalleryBackground) mainGalleryBackgroundView.clearAnimation() - GlideApp.with(context).load(getBackgroundImageId(menuItem)).into(mainGalleryBackgroundView) + Glide.with(context).load(getBackgroundImageId(menuItem)).into(mainGalleryBackgroundView) view.clearAnimation() view.background = ContextCompat.getDrawable(view.context, R.drawable.rounded_transparent_border) if (shouldFadeIn()) { diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java index e07e03b29..6b6816d1e 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java +++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java @@ -24,9 +24,10 @@ import androidx.core.app.NotificationCompat; import android.util.Log; +import com.bumptech.glide.Glide; + import java.io.IOException; -import us.nineworlds.serenity.GlideApp; import us.nineworlds.serenity.injection.BaseInjector; /* @@ -137,7 +138,7 @@ public Notification build() throws IOException { .setExtras(extras); try { - Bitmap image = GlideApp.with(mContext).asBitmap().load(mImageUri).into(176, 313).get(); + Bitmap image = Glide.with(mContext).asBitmap().load(mImageUri).into(176, 313).get(); builder = builder.setLargeIcon(image); } catch (Exception ex) { diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java index e20aa6318..9a1ece4f0 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java +++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java @@ -41,8 +41,8 @@ */ public class MenuMediaContainer extends AbstractMediaContainer { - @Inject protected SharedPreferences preferences; - @Inject protected Resources resources; + @Inject public SharedPreferences preferences; + @Inject public Resources resources; private static final String SETTINGS_SECTION_KEY = "0"; private static final String SETTINGS_TYPE = "settings"; diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt b/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt index 9c38adeab..1ce86bdfd 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt +++ b/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt @@ -6,9 +6,9 @@ import androidx.leanback.widget.* import us.nineworlds.serenity.core.model.CategoryInfo import android.content.Intent import android.widget.ImageView +import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import toothpick.Toothpick -import us.nineworlds.serenity.GlideApp import us.nineworlds.serenity.R import us.nineworlds.serenity.common.annotations.InjectionConstants import us.nineworlds.serenity.common.rest.Types @@ -65,7 +65,7 @@ class MainMenuVideoContentVerticalGridFragment : RowsSupportFragment() { val imageView = requireActivity().findViewById(R.id.mainGalleryBackground) - GlideApp.with(requireActivity()).load(videoCategory.item.backgroundURL).transition(DrawableTransitionOptions.withCrossFade()).fitCenter().into(imageView) + Glide.with(requireActivity()).load(videoCategory.item.backgroundURL).transition(DrawableTransitionOptions.withCrossFade()).fitCenter().into(imageView) } } } diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java index c428f82ed..509082397 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java +++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java @@ -6,8 +6,8 @@ import com.birbit.android.jobqueue.Job; import com.birbit.android.jobqueue.Params; import com.birbit.android.jobqueue.RetryConstraint; +import com.bumptech.glide.Glide; -import us.nineworlds.serenity.GlideApp; /** * Created by dcarver on 7/2/17. @@ -27,8 +27,8 @@ public GlideClearCacheJob(Context context) { } @Override public void onRun() throws Throwable { - GlideApp.get(context).clearDiskCache(); - GlideApp.get(context).clearMemory(); + Glide.get(context).clearDiskCache(); + Glide.get(context).clearMemory(); } @Override protected void onCancel(int cancelReason, @Nullable Throwable throwable) { diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt index 18ee386bd..b58297b05 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt +++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt @@ -35,7 +35,7 @@ import androidx.core.content.ContextCompat import android.view.View import android.view.ViewGroup import android.widget.ImageView -import us.nineworlds.serenity.GlideApp +import com.bumptech.glide.Glide import us.nineworlds.serenity.R import us.nineworlds.serenity.core.model.VideoContentInfo @@ -100,7 +100,7 @@ class CardPresenter(private val context: Context) : Presenter() { } fun updateCardViewImage(url: String) { - GlideApp.with(context).load(url).fitCenter().into(cardView.mainImageView) + Glide.with(context).load(url).fitCenter().into(cardView.mainImageView) } } } diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java index 66bb0d09a..ddfc8d8eb 100644 --- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java +++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java @@ -39,10 +39,11 @@ import android.text.TextUtils; import android.view.View; import android.widget.Toast; + +import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import toothpick.Toothpick; -import us.nineworlds.serenity.GlideApp; import us.nineworlds.serenity.R; import us.nineworlds.serenity.common.annotations.InjectionConstants; import us.nineworlds.serenity.common.rest.SerenityClient; @@ -123,7 +124,7 @@ public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition(R.id.detail_background_image) - GlideApp.with(requireActivity()).load(videoInfo.backgroundURL).fitCenter().into(imageView) + Glide.with(requireActivity()).load(videoInfo.backgroundURL).fitCenter().into(imageView) when (videoInfo) { is TVShowSeriesInfo -> setupTVShowDetails(videoInfo) diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt index 99ffdf86a..a6196be2f 100644 --- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt +++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt @@ -6,8 +6,8 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View import android.widget.ImageView import android.widget.TextView +import com.bumptech.glide.Glide import toothpick.Toothpick -import us.nineworlds.serenity.GlideApp import us.nineworlds.serenity.R import us.nineworlds.serenity.common.annotations.InjectionConstants import us.nineworlds.serenity.common.rest.SerenityClient @@ -31,7 +31,7 @@ class LoginUserViewHolder(view: View) : ViewHolder(view) { val placeHolder = ContextCompat.getDrawable(profileImage.context, R.drawable.ic_generic_user) DrawableCompat.setTint(placeHolder!!, ContextCompat.getColor(profileImage.context, R.color.white)) - GlideApp.with(profileImage.context) + Glide.with(profileImage.context) .asDrawable() .load(serenityClient.createUserImageUrl(user, 150, 150)) .placeholder(placeHolder) diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt index 4cbeeab00..3b9db002b 100644 --- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt +++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt @@ -6,7 +6,6 @@ import android.widget.ImageView import androidx.core.content.ContextCompat import androidx.leanback.widget.ImageCardView import androidx.leanback.widget.Presenter -import us.nineworlds.serenity.GlideApp import us.nineworlds.serenity.R import us.nineworlds.serenity.common.rest.Types import us.nineworlds.serenity.core.model.VideoCategory diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/EpisodeVideoPresenter.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/EpisodeVideoPresenter.kt index a55e662ae..5b490f232 100644 --- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/EpisodeVideoPresenter.kt +++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/EpisodeVideoPresenter.kt @@ -6,7 +6,7 @@ import android.widget.ImageView import androidx.core.content.ContextCompat import androidx.leanback.widget.ImageCardView import androidx.leanback.widget.Presenter -import us.nineworlds.serenity.GlideApp +import com.bumptech.glide.Glide import us.nineworlds.serenity.R import us.nineworlds.serenity.core.model.VideoContentInfo import us.nineworlds.serenity.core.model.impl.EpisodePosterInfo @@ -54,7 +54,7 @@ class EpisodeVideoPresenter : Presenter() { } fun updateCardViewImage(url: String) { - GlideApp.with(view.context).load(url).fitCenter().into(cardView.mainImageView) + Glide.with(view.context).load(url).fitCenter().into(cardView.mainImageView) } } diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt index 274f60604..4eb35c43c 100644 --- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt +++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt @@ -4,7 +4,6 @@ import android.graphics.Bitmap import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import androidx.leanback.widget.RowPresenter -import us.nineworlds.serenity.GlideApp import us.nineworlds.serenity.R import us.nineworlds.serenity.core.model.VideoContentInfo import us.nineworlds.serenity.databinding.LeanbackDetailsSummaryBinding @@ -13,6 +12,7 @@ import android.widget.LinearLayout import android.widget.RatingBar import android.view.ViewGroup +import com.bumptech.glide.Glide class MoviePresenterViewHolder(private val binding: LeanbackDetailsSummaryBinding) : RowPresenter.ViewHolder(binding.root) { @@ -23,7 +23,7 @@ class MoviePresenterViewHolder(private val binding: LeanbackDetailsSummaryBindin binding.movieBrowserPosterTitle.text = videoInfo.title binding.movieSummary.text = videoInfo.summary - GlideApp.with(context).load(videoInfo.imageURL).fitCenter().into(binding.videoPoster) + Glide.with(context).load(videoInfo.imageURL).fitCenter().into(binding.videoPoster) val width = context.resources.getDimensionPixelSize(R.dimen.info_graphic_width) val height = context.resources.getDimensionPixelSize(R.dimen.info_graphic_height) diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt index d5c9ebf6d..75293dc0e 100644 --- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt +++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt @@ -17,9 +17,8 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.Bitmap import android.graphics.drawable.Drawable -import us.nineworlds.serenity.GlideApp +import com.bumptech.glide.Glide import us.nineworlds.serenity.R -import us.nineworlds.serenity.ui.util.ImageUtils open class SeriesPresenterViewHolder(private val binding: LeanbackDetailsSummaryBinding) : Presenter.ViewHolder(binding.root) { @@ -29,7 +28,7 @@ open class SeriesPresenterViewHolder(private val binding: LeanbackDetailsSummary binding.movieBrowserPosterTitle.text = videoInfo.title binding.movieSummary.text = videoInfo.summary - GlideApp.with(context).load(videoInfo.thumbNailURL).fitCenter().into(binding.videoPoster) + Glide.with(context).load(videoInfo.thumbNailURL).fitCenter().into(binding.videoPoster) val width = context.resources.getDimensionPixelSize(R.dimen.info_graphic_width) val height = context.resources.getDimensionPixelSize(R.dimen.info_graphic_height) diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt index bb8d15981..10229960b 100644 --- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt +++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt @@ -36,8 +36,8 @@ import android.widget.ImageView import android.widget.ImageView.ScaleType import android.widget.LinearLayout import android.widget.TextView +import com.bumptech.glide.Glide import timber.log.Timber -import us.nineworlds.serenity.GlideApp import us.nineworlds.serenity.R import us.nineworlds.serenity.common.rest.SerenityClient import us.nineworlds.serenity.core.model.VideoContentInfo @@ -203,7 +203,7 @@ class ImageInfographicUtils(private val width: Int, private val height: Int) : B v.scaleType = ScaleType.FIT_XY v.layoutParams = LayoutParams(width, height) val mediaTagUrl = factory!!.createMediaTagURL("studio", studio, identifier) - GlideApp.with(context).load(mediaTagUrl).into(v) + Glide.with(context).load(mediaTagUrl).into(v) return v } diff --git a/serenity-common/build.gradle.kts b/serenity-common/build.gradle.kts index 73abfa0dc..4fdba3316 100644 --- a/serenity-common/build.gradle.kts +++ b/serenity-common/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile plugins { id("java") id("kotlin") - kotlin("kapt") } java {