Feature/bump gradle and dependencies (#118)

nitzanj · web-flow · commit 5095be52090e · 2020-07-15T13:55:41.000+03:00
* Bump Gradle version and dependencies.
* Replace glide extension with full adapter in sample app.
* Force https urls on `DownloadRequestBuilderImplTest` to fix tests.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ allprojects {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
+            classpath 'com.android.tools.build:gradle:4.0.0'
             classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
             classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"
             classpath 'digital.wup:android-maven-publish:3.6.2'
diff --git a/download/build.gradle b/download/build.gradle
@@ -12,7 +12,6 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
-        multiDexEnabled true
 
         manifestPlaceholders = [cloudinaryUrl: getCloudinaryUrl() ?: ""]
     }
diff --git a/download/src/androidTest/java/com/cloudinary/android/download/DownloadRequestBuilderImplTest.java b/download/src/androidTest/java/com/cloudinary/android/download/DownloadRequestBuilderImplTest.java
@@ -4,6 +4,8 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+
 import com.cloudinary.Transformation;
 import com.cloudinary.android.MediaManager;
 import com.cloudinary.android.ResponsiveUrl;
@@ -16,8 +18,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import androidx.test.platform.app.InstrumentationRegistry;
-
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -42,6 +42,7 @@ public synchronized static void setup() {
         if (!initialized) {
             MediaManager.init(InstrumentationRegistry.getInstrumentation().getTargetContext());
             cloudName = MediaManager.get().getCloudinary().config.cloudName;
+            MediaManager.get().getCloudinary().config.secure = true;
             initialized = true;
         }
     }
diff --git a/glide-integration/src/androidTest/java/com/cloudinary/android/glide_integration/CloudinaryRequestModelLoaderTest.java b/glide-integration/src/androidTest/java/com/cloudinary/android/glide_integration/CloudinaryRequestModelLoaderTest.java
@@ -2,6 +2,9 @@
 
 import android.content.Context;
 
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
+import androidx.test.platform.app.InstrumentationRegistry;
+
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
@@ -23,9 +26,6 @@
 
 import java.io.InputStream;
 
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
-import androidx.test.platform.app.InstrumentationRegistry;
-
 import static com.bumptech.glide.request.target.Target.SIZE_ORIGINAL;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -48,6 +48,7 @@ public static void setUp() {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         MediaManager.init(context);
         MediaManager.get().getCloudinary().config.cloudName = TEST_CLOUD_NAME;
+        MediaManager.get().getCloudinary().config.secure = true;
     }
 
     @Before
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/preprocess/build.gradle b/preprocess/build.gradle
@@ -4,7 +4,6 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
 
-
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 29
diff --git a/publish.gradle b/publish.gradle
@@ -125,4 +125,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 
 artifacts {
     archives javadocJar, sourcesJar
+}
+
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -40,12 +40,10 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.1.0'
+    implementation 'androidx.exifinterface:exifinterface:1.2.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
-    implementation project(':glide-integration')
 
     implementation ('com.google.android.exoplayer:exoplayer:2.9.5', {
         exclude group: "com.android.support"
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/EffectsGalleryAdapter.java b/sample/src/main/java/com/cloudinary/android/sample/app/EffectsGalleryAdapter.java
@@ -1,13 +1,14 @@
 package com.cloudinary.android.sample.app;
 
-import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
 import com.cloudinary.Url;
 import com.cloudinary.android.MediaManager;
 import com.cloudinary.android.ResponsiveUrl;
@@ -22,12 +23,10 @@ class EffectsGalleryAdapter extends RecyclerView.Adapter<EffectsGalleryAdapter.I
     private final int requiredSize;
     private final ItemClickListener listener;
     private List<EffectData> images;
-    private Context context;
     private EffectData selected = null;
     private String resourceType;
 
-    EffectsGalleryAdapter(Context context, List<EffectData> images, String resourceType, int requiredSize, ItemClickListener listener) {
-        this.context = context;
+    EffectsGalleryAdapter(List<EffectData> images, String resourceType, int requiredSize, ItemClickListener listener) {
         this.resourceType = resourceType;
         this.images = images;
         this.requiredSize = requiredSize;
@@ -71,7 +70,7 @@ public void onBindViewHolder(final EffectsGalleryAdapter.ImageViewHolder holder,
                 .generate(baseUrl, holder.imageView, new ResponsiveUrl.Callback() {
                     @Override
                     public void onUrlReady(Url url) {
-                        GlideApp.with(holder.imageView).load(url.generate()).placeholder(R.drawable.placeholder).into(holder.imageView);
+                        Glide.with(holder.imageView).load(url.generate()).placeholder(R.drawable.placeholder).into(holder.imageView);
                     }
                 });
 
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/FailedPagerFragment.java b/sample/src/main/java/com/cloudinary/android/sample/app/FailedPagerFragment.java
@@ -2,16 +2,17 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.cloudinary.android.sample.R;
 import com.cloudinary.android.sample.model.Resource;
 import com.cloudinary.android.sample.persist.ResourceRepo;
@@ -54,7 +55,7 @@ protected void addItemDecoration(RecyclerView recyclerView) {
 
     @Override
     protected ResourcesAdapter getAdapter(int thumbSize) {
-        return new ResourcesAdapter(getActivity(), new ArrayList<Resource>(), thumbSize, statuses, new ResourcesAdapter.ImageClickedListener() {
+        return new ResourcesAdapter(new ArrayList<Resource>(), thumbSize, statuses, new ResourcesAdapter.ImageClickedListener() {
             @Override
             public void onImageClicked(Resource resource) {
                 // NOP
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/ImageActivity.java b/sample/src/main/java/com/cloudinary/android/sample/app/ImageActivity.java
@@ -2,17 +2,8 @@
 
 import android.content.ClipData;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import com.cloudinary.android.download.DownloadRequestCallback;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.OrientationHelper;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -23,9 +14,17 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.cloudinary.Url;
 import com.cloudinary.android.MediaManager;
 import com.cloudinary.android.ResponsiveUrl;
+import com.cloudinary.android.download.DownloadRequestCallback;
 import com.cloudinary.android.sample.R;
 import com.cloudinary.android.sample.core.CloudinaryHelper;
 import com.cloudinary.android.sample.model.EffectData;
@@ -52,6 +51,7 @@
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.util.List;
 
@@ -152,7 +152,7 @@ public boolean onPreDraw() {
                 recyclerView.getViewTreeObserver().removeOnPreDrawListener(this);
                 thumbHeight = Math.round((float) (recyclerView.getWidth() / 4));
                 List<EffectData> data = CloudinaryHelper.generateEffectsList(ImageActivity.this, resource);
-                recyclerView.setAdapter(new EffectsGalleryAdapter(ImageActivity.this, data, resource.getResourceType(), thumbHeight, new EffectsGalleryAdapter.ItemClickListener() {
+                recyclerView.setAdapter(new EffectsGalleryAdapter(data, resource.getResourceType(), thumbHeight, new EffectsGalleryAdapter.ItemClickListener() {
                     @Override
                     public void onClick(EffectData data) {
                         updateMainImage(data);
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/MainActivity.java b/sample/src/main/java/com/cloudinary/android/sample/app/MainActivity.java
@@ -33,7 +33,6 @@
 import com.cloudinary.android.sample.persist.ResourceRepo;
 import com.cloudinary.android.uploadwidget.UploadWidget;
 import com.cloudinary.utils.StringUtils;
-
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
@@ -397,7 +396,6 @@ public List<AbstractPagerFragment> getPages() {
     public void onDeleteAllLocally() {
         ResourceRepo.getInstance().clear();
         MediaManager.get().cancelAllRequests();
-        GlideApp.get(this).clearMemory();
 
         for (AbstractPagerFragment fragment : getPages()) {
             fragment.clearData();
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/MainApplication.java b/sample/src/main/java/com/cloudinary/android/sample/app/MainApplication.java
@@ -11,7 +11,7 @@
 
 import com.cloudinary.android.LogLevel;
 import com.cloudinary.android.MediaManager;
-import com.cloudinary.android.download.picasso.PicassoDownloadRequestBuilderFactory;
+import com.cloudinary.android.download.glide.GlideDownloadRequestBuilderFactory;
 import com.cloudinary.android.policy.GlobalUploadPolicy;
 import com.cloudinary.android.policy.UploadPolicy;
 import com.cloudinary.android.sample.R;
@@ -35,7 +35,7 @@ public void onCreate() {
 
         // Mandatory - call a flavor of init. Config can be null if cloudinary_url is provided in the manifest.
         MediaManager.init(this);
-        MediaManager.get().setDownloadRequestBuilderFactory(new PicassoDownloadRequestBuilderFactory());
+        MediaManager.get().setDownloadRequestBuilderFactory(new GlideDownloadRequestBuilderFactory());
 
         // Optional - configure global policy.
         MediaManager.get().setGlobalUploadPolicy(
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/MyAppGlideModule.java b/sample/src/main/java/com/cloudinary/android/sample/app/MyAppGlideModule.java
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/QueuedPagerFragment.java b/sample/src/main/java/com/cloudinary/android/sample/app/QueuedPagerFragment.java
@@ -1,13 +1,14 @@
 package com.cloudinary.android.sample.app;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.cloudinary.android.sample.R;
 import com.cloudinary.android.sample.model.Resource;
 import com.cloudinary.android.sample.persist.ResourceRepo;
@@ -42,7 +43,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
     @Override
     protected ResourcesAdapter getAdapter(int thumbSize) {
-        return new ResourcesAdapter(getActivity(), new ArrayList<Resource>(), thumbSize, statuses, new ResourcesAdapter.ImageClickedListener() {
+        return new ResourcesAdapter(new ArrayList<Resource>(), thumbSize, statuses, new ResourcesAdapter.ImageClickedListener() {
             @Override
             public void onImageClicked(Resource resource) {
 
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/ResourcesAdapter.java b/sample/src/main/java/com/cloudinary/android/sample/app/ResourcesAdapter.java
@@ -1,7 +1,5 @@
 package com.cloudinary.android.sample.app;
 
-import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
@@ -11,6 +9,9 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
 import com.cloudinary.Url;
 import com.cloudinary.android.MediaManager;
 import com.cloudinary.android.ResponsiveUrl;
@@ -20,6 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.cloudinary.android.ResponsiveUrl.Preset.AUTO_FILL;
+
 class ResourcesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private static final int TYPE_REGULAR = 0;
     private static final int TYPE_ERROR = 1;
@@ -28,17 +31,10 @@ class ResourcesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final ImageClickedListener listener;
     private final List<Resource.UploadStatus> validStatuses;
     private List<ResourceWithMeta> resources;
-    private Context context;
-    private int cardImageHeight;
-    private int cardImageWidth;
-
-    ResourcesAdapter(Context context, List<Resource> resources, int requiredSize, List<Resource.UploadStatus> validStatuses, ImageClickedListener listener) {
-        this.context = context;
+    ResourcesAdapter(List<Resource> resources, int requiredSize, List<Resource.UploadStatus> validStatuses, ImageClickedListener listener) {
         this.listener = listener;
         this.requiredSize = requiredSize;
         this.validStatuses = validStatuses;
-        cardImageWidth = context.getResources().getDimensionPixelSize(R.dimen.card_image_width);
-        cardImageHeight = context.getResources().getDimensionPixelSize(R.dimen.card_height);
 
         this.resources = new ArrayList<>(resources.size());
         for (Resource resource : resources) {
@@ -163,7 +159,10 @@ private void bindErrorView(FailedResourceViewHolder holder, int position) {
         holder.errorDescription.setText(resource.getLastErrorDesc());
         boolean isVideo = resource.getResourceType().equals("video");
         int placeHolder = isVideo ? R.drawable.video_placeholder : R.drawable.placeholder;
-        GlideApp.with(holder.imageView).load(resource.getLocalUri()).placeholder(placeHolder).centerCrop().override(R.dimen.card_image_width, R.dimen.card_height).into(holder.imageView);
+
+        // if we need some specific glide api (override local file dimensions) we can always access it the regular way:
+        Glide.with(holder.imageView).load(resource.getLocalUri()).placeholder(placeHolder).centerCrop().override(R.dimen.card_image_width, R.dimen.card_height).into(holder.imageView);
+
         holder.retryButton.setTag(resource);
         holder.cancelButton.setTag(resource);
         holder.rescheduleLabel.setVisibility(resource.getStatus() == Resource.UploadStatus.RESCHEDULED ? View.VISIBLE : View.GONE);
@@ -222,15 +221,15 @@ private void bindRegularView(final ResourceViewHolder holder, int position) {
         final int placeholder = resource.getResourceType().equals("image") ? R.drawable.placeholder : R.drawable.video_placeholder;
 
         if (local) {
-            GlideApp.with(holder.imageView).load(resource.getLocalUri()).placeholder(placeholder).centerCrop().override(requiredSize).into(holder.imageView);
+            Glide.with(holder.imageView).load(resource.getLocalUri()).placeholder(placeholder).centerCrop().override(requiredSize).into(holder.imageView);
         } else {
             String publicId = resource.getCloudinaryPublicId();
             Url url = MediaManager.get().url().publicId(publicId).resourceType(resource.getResourceType()).format("webp");
-            MediaManager.get().responsiveUrl(ResponsiveUrl.Preset.AUTO_FILL)
+            MediaManager.get().responsiveUrl(AUTO_FILL)
                     .generate(url, holder.imageView, new ResponsiveUrl.Callback() {
                         @Override
                         public void onUrlReady(Url url) {
-                            GlideApp.with(holder.imageView).load(url.generate()).placeholder(placeholder).into(holder.imageView);
+                            Glide.with(holder.imageView).load(url.generate()).placeholder(placeholder).into(holder.imageView);
                         }
                     });
         }
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/UploadedPageFragment.java b/sample/src/main/java/com/cloudinary/android/sample/app/UploadedPageFragment.java

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ allprojects {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- classpath 'com.android.tools.build:gradle:3.5.3'`
	`13`	`+ classpath 'com.android.tools.build:gradle:4.0.0'`
`14`	`14`	`classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"`
`15`	`15`	`classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"`
`16`	`16`	`classpath 'digital.wup:android-maven-publish:3.6.2'`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ android {`
`12`	`12`
`13`	`13`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`14`	`14`	`consumerProguardFiles 'consumer-rules.pro'`
`15`		`- multiDexEnabled true`
`16`	`15`
`17`	`16`	`manifestPlaceholders = [cloudinaryUrl: getCloudinaryUrl() ?: ""]`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,4 +125,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) {`
`125`	`125`
`126`	`126`	`artifacts {`
`127`	`127`	`archives javadocJar, sourcesJar`
	`128`	`+}`
	`129`	`+`
	`130`	`+tasks.withType(GenerateModuleMetadata) {`
	`131`	`+ enabled = false`
`128`	`132`	`}`