Skip to content

Commit 5095be5

Browse files
authored
Feature/bump gradle and dependencies (#118)
* Bump Gradle version and dependencies. * Replace glide extension with full adapter in sample app. * Force https urls on `DownloadRequestBuilderImplTest` to fix tests.
1 parent 8608d49 commit 5095be5

File tree

17 files changed

+56
-62
lines changed

17 files changed

+56
-62
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ allprojects {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.5.3'
13+
classpath 'com.android.tools.build:gradle:4.0.0'
1414
classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
1515
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"
1616
classpath 'digital.wup:android-maven-publish:3.6.2'

download/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ android {
1212

1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
consumerProguardFiles 'consumer-rules.pro'
15-
multiDexEnabled true
1615

1716
manifestPlaceholders = [cloudinaryUrl: getCloudinaryUrl() ?: ""]
1817
}

download/src/androidTest/java/com/cloudinary/android/download/DownloadRequestBuilderImplTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import android.widget.ImageView;
55
import android.widget.LinearLayout;
66

7+
import androidx.test.platform.app.InstrumentationRegistry;
8+
79
import com.cloudinary.Transformation;
810
import com.cloudinary.android.MediaManager;
911
import com.cloudinary.android.ResponsiveUrl;
@@ -16,8 +18,6 @@
1618
import org.mockito.Mock;
1719
import org.mockito.junit.MockitoJUnitRunner;
1820

19-
import androidx.test.platform.app.InstrumentationRegistry;
20-
2121
import static org.mockito.ArgumentMatchers.eq;
2222
import static org.mockito.Mockito.times;
2323
import static org.mockito.Mockito.verify;
@@ -42,6 +42,7 @@ public synchronized static void setup() {
4242
if (!initialized) {
4343
MediaManager.init(InstrumentationRegistry.getInstrumentation().getTargetContext());
4444
cloudName = MediaManager.get().getCloudinary().config.cloudName;
45+
MediaManager.get().getCloudinary().config.secure = true;
4546
initialized = true;
4647
}
4748
}

glide-integration/src/androidTest/java/com/cloudinary/android/glide_integration/CloudinaryRequestModelLoaderTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import android.content.Context;
44

5+
import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
6+
import androidx.test.platform.app.InstrumentationRegistry;
7+
58
import com.bumptech.glide.load.Options;
69
import com.bumptech.glide.load.model.GlideUrl;
710
import com.bumptech.glide.load.model.ModelLoader;
@@ -23,9 +26,6 @@
2326

2427
import java.io.InputStream;
2528

26-
import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
27-
import androidx.test.platform.app.InstrumentationRegistry;
28-
2929
import static com.bumptech.glide.request.target.Target.SIZE_ORIGINAL;
3030
import static org.mockito.ArgumentMatchers.any;
3131
import static org.mockito.ArgumentMatchers.anyInt;
@@ -48,6 +48,7 @@ public static void setUp() {
4848
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
4949
MediaManager.init(context);
5050
MediaManager.get().getCloudinary().config.cloudName = TEST_CLOUD_NAME;
51+
MediaManager.get().getCloudinary().config.secure = true;
5152
}
5253

5354
@Before

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
7-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
7+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

preprocess/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ android {
44
compileSdkVersion 29
55
buildToolsVersion "29.0.2"
66

7-
87
defaultConfig {
98
minSdkVersion 14
109
targetSdkVersion 29

publish.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
125125

126126
artifacts {
127127
archives javadocJar, sourcesJar
128+
}
129+
130+
tasks.withType(GenerateModuleMetadata) {
131+
enabled = false
128132
}

sample/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ dependencies {
4040
implementation 'androidx.recyclerview:recyclerview:1.1.0'
4141
implementation 'com.google.android.material:material:1.1.0'
4242
implementation 'androidx.cardview:cardview:1.0.0'
43-
implementation 'androidx.exifinterface:exifinterface:1.1.0'
43+
implementation 'androidx.exifinterface:exifinterface:1.2.0'
4444
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
4545

4646
implementation 'com.github.bumptech.glide:glide:4.11.0'
47-
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
48-
implementation project(':glide-integration')
4947

5048
implementation ('com.google.android.exoplayer:exoplayer:2.9.5', {
5149
exclude group: "com.android.support"

sample/src/main/java/com/cloudinary/android/sample/app/EffectsGalleryAdapter.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.cloudinary.android.sample.app;
22

3-
import android.content.Context;
4-
import androidx.recyclerview.widget.RecyclerView;
53
import android.view.LayoutInflater;
64
import android.view.View;
75
import android.view.ViewGroup;
86
import android.widget.ImageView;
97
import android.widget.TextView;
108

9+
import androidx.recyclerview.widget.RecyclerView;
10+
11+
import com.bumptech.glide.Glide;
1112
import com.cloudinary.Url;
1213
import com.cloudinary.android.MediaManager;
1314
import com.cloudinary.android.ResponsiveUrl;
@@ -22,12 +23,10 @@ class EffectsGalleryAdapter extends RecyclerView.Adapter<EffectsGalleryAdapter.I
2223
private final int requiredSize;
2324
private final ItemClickListener listener;
2425
private List<EffectData> images;
25-
private Context context;
2626
private EffectData selected = null;
2727
private String resourceType;
2828

29-
EffectsGalleryAdapter(Context context, List<EffectData> images, String resourceType, int requiredSize, ItemClickListener listener) {
30-
this.context = context;
29+
EffectsGalleryAdapter(List<EffectData> images, String resourceType, int requiredSize, ItemClickListener listener) {
3130
this.resourceType = resourceType;
3231
this.images = images;
3332
this.requiredSize = requiredSize;
@@ -71,7 +70,7 @@ public void onBindViewHolder(final EffectsGalleryAdapter.ImageViewHolder holder,
7170
.generate(baseUrl, holder.imageView, new ResponsiveUrl.Callback() {
7271
@Override
7372
public void onUrlReady(Url url) {
74-
GlideApp.with(holder.imageView).load(url.generate()).placeholder(R.drawable.placeholder).into(holder.imageView);
73+
Glide.with(holder.imageView).load(url.generate()).placeholder(R.drawable.placeholder).into(holder.imageView);
7574
}
7675
});
7776

sample/src/main/java/com/cloudinary/android/sample/app/FailedPagerFragment.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import androidx.annotation.NonNull;
6-
import androidx.fragment.app.Fragment;
7-
import androidx.recyclerview.widget.LinearLayoutManager;
8-
import androidx.recyclerview.widget.RecyclerView;
95
import android.view.LayoutInflater;
106
import android.view.View;
117
import android.view.ViewGroup;
128
import android.widget.Button;
139
import android.widget.TextView;
1410

11+
import androidx.annotation.NonNull;
12+
import androidx.fragment.app.Fragment;
13+
import androidx.recyclerview.widget.LinearLayoutManager;
14+
import androidx.recyclerview.widget.RecyclerView;
15+
1516
import com.cloudinary.android.sample.R;
1617
import com.cloudinary.android.sample.model.Resource;
1718
import com.cloudinary.android.sample.persist.ResourceRepo;
@@ -54,7 +55,7 @@ protected void addItemDecoration(RecyclerView recyclerView) {
5455

5556
@Override
5657
protected ResourcesAdapter getAdapter(int thumbSize) {
57-
return new ResourcesAdapter(getActivity(), new ArrayList<Resource>(), thumbSize, statuses, new ResourcesAdapter.ImageClickedListener() {
58+
return new ResourcesAdapter(new ArrayList<Resource>(), thumbSize, statuses, new ResourcesAdapter.ImageClickedListener() {
5859
@Override
5960
public void onImageClicked(Resource resource) {
6061
// NOP

0 commit comments

Comments
 (0)