Skip to content

Commit ed7d7ea

Browse files
adimiz1adimiz1
authored
Bump dependencies
1 parent 0ececcd commit ed7d7ea

File tree

36 files changed

+224
-183
lines changed

36 files changed

+224
-183
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ test-output/
4848

4949
# Maven
5050

51-
target/
5251
pom.xml.tag
5352
pom.xml.releaseBackup
5453
pom.xml.versionsBackup

‎.travis.yml‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
language: android
2+
jdk:
3+
- openjdk11
24
dist: trusty
35
sudo: required
46

57
global:
6-
# switch glibc to a memory conserving mode
7-
- MALLOC_ARENA_MAX=2
8-
# wait up to 10 minutes for adb to connect to emulator
9-
- ADB_INSTALL_TIMEOUT=10
8+
# switch glibc to a memory conserving mode
9+
- MALLOC_ARENA_MAX=2
10+
# wait up to 10 minutes for adb to connect to emulator
11+
- ADB_INSTALL_TIMEOUT=10
12+
env:
13+
global:
14+
- TARGET_VERSION=30
15+
- ANDROID_BUILD_TOOLS_VERSION=30.0.2
16+
- ANDROID_HOME=~/android-sdk
1017
android:
1118
licenses:
1219
- 'android-sdk-preview-license-.+'
@@ -15,17 +22,23 @@ android:
1522
components:
1623
- tools
1724
- platform-tools
18-
- build-tools-29.0.2
25+
- build-tools-30.0.2
1926
- android-21
20-
- android-29
27+
- android-31
28+
- android ${TARGET_VERSION}
2129
- extra-google-google_play_services
2230
- extra-google-m2repository
2331
- extra-android-m2repository
2432
- addon-google_apis-google-25
2533
- sys-img-armeabi-v7a-android-21
2634

35+
#taken from: https://travis-ci.community/t/sdkmanager-to-run-with-java-11/11978/2
2736
before_install:
28-
- yes | sdkmanager "platforms;android-28"
37+
- touch $HOME/.android/repositories.cfg
38+
- wget "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip" -O commandlinetools.zip
39+
- unzip commandlinetools.zip -d $ANDROID_HOME/
40+
- yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager "platforms;android-${TARGET_VERSION}" --sdk_root=$ANDROID_HOME
41+
- yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" --sdk_root=$ANDROID_HOME
2942

3043
before_cache:
3144
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -35,9 +48,6 @@ cache:
3548
- $HOME/.gradle/caches/
3649
- $HOME/.gradle/wrapper/
3750

38-
jdk:
39-
- oraclejdk8
40-
4151
# Emulator Management: Create, Start and Wait
4252
before_script:
4353
- echo no | android create avd --force -n test -t android-21
@@ -51,4 +61,3 @@ notifications:
5161
email:
5262
recipients:
5363
- [email protected]
54-

‎all/build.gradle‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.2"
4+
compileSdkVersion 31
5+
buildToolsVersion "30.0.2"
66

77

88
defaultConfig {
9-
minSdkVersion 14
10-
targetSdkVersion 29
9+
minSdkVersion 19
10+
targetSdkVersion 31
1111
versionCode 1
1212
versionName "1.0"
13-
1413
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1514
consumerProguardFiles 'consumer-rules.pro'
1615
}
@@ -22,6 +21,11 @@ android {
2221
}
2322
}
2423

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2529
}
2630

2731
dependencies {
@@ -31,10 +35,10 @@ dependencies {
3135
api project(path: ':ui')
3236
api project(path: ':download')
3337

34-
implementation 'androidx.appcompat:appcompat:1.1.0'
38+
implementation 'androidx.appcompat:appcompat:1.3.0'
3539
testImplementation 'junit:junit:4.12'
36-
androidTestImplementation 'androidx.test:runner:1.2.0'
37-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
40+
androidTestImplementation 'androidx.test:runner:1.4.0'
41+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
3842
}
3943

4044
ext {

‎build.gradle‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ allprojects {
33
buildscript {
44
repositories {
55
google()
6-
jcenter()
7-
maven {
8-
url "https://plugins.gradle.org/m2/"
9-
}
6+
mavenCentral()
7+
maven { url "https://plugins.gradle.org/m2/" }
108
}
119

1210
dependencies {
13-
classpath 'com.android.tools.build:gradle:4.0.0'
11+
classpath 'com.android.tools.build:gradle:7.0.4'
1412
classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
1513
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"
1614
classpath 'digital.wup:android-maven-publish:3.6.2'
@@ -23,7 +21,6 @@ allprojects {
2321

2422
repositories {
2523
google()
26-
jcenter()
2724
mavenCentral()
2825
}
2926

‎core/build.gradle‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.2"
4+
compileSdkVersion 31
5+
buildToolsVersion "30.0.2"
66

77

88
defaultConfig {
9-
minSdkVersion 14
10-
targetSdkVersion 29
9+
minSdkVersion 19
10+
targetSdkVersion 31
1111
versionCode 1
1212
versionName "1.0"
13+
multiDexEnabled true
1314
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14-
1515
// filter in the api credentials before building but without changing original source
1616
// files - to make sure the credentials are not checked into source control.
1717
// The url is taken from a property or environment variable:
@@ -25,6 +25,11 @@ android {
2525
consumerProguardFiles 'proguard-rules.pro'
2626
}
2727
}
28+
29+
compileOptions {
30+
sourceCompatibility JavaVersion.VERSION_1_8
31+
targetCompatibility JavaVersion.VERSION_1_8
32+
}
2833
}
2934

3035
task verifyCloudinaryCredentials {
@@ -43,24 +48,24 @@ tasks.matching { it.name.startsWith("connected") || it.name.startsWith("test")}.
4348
dependencies {
4449
api "com.cloudinary:cloudinary-core:${cloudinaryLibsVersion}"
4550

46-
implementation 'androidx.core:core:1.2.0'
47-
implementation 'androidx.appcompat:appcompat:1.1.0'
51+
implementation 'androidx.core:core:1.6.0'
52+
implementation 'androidx.appcompat:appcompat:1.3.0'
4853
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
49-
implementation 'com.google.android.material:material:1.1.0'
54+
implementation 'com.google.android.material:material:1.4.0'
5055
implementation('com.evernote:android-job:1.4.2', {
5156
exclude group: 'com.android.support', module: 'support-compat'
5257
})
5358

54-
testImplementation 'androidx.test.ext:junit:1.1.1'
59+
testImplementation 'androidx.test.ext:junit:1.1.3'
5560
testImplementation "com.cloudinary:cloudinary-test-common:${cloudinaryLibsVersion}"
56-
androidTestImplementation 'org.awaitility:awaitility:3.0.0'
57-
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
61+
androidTestImplementation 'org.awaitility:awaitility:3.1.6'
62+
androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
5863
exclude group: 'com.android.support', module: 'support-annotations'
5964
})
60-
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
61-
androidTestImplementation 'androidx.test:runner:1.2.0'
62-
androidTestImplementation 'androidx.test:rules:1.2.0'
63-
androidTestImplementation "org.hamcrest:hamcrest-library:1.3"
65+
androidTestImplementation 'androidx.annotation:annotation:1.2.0'
66+
androidTestImplementation 'androidx.test:runner:1.4.0'
67+
androidTestImplementation 'androidx.test:rules:1.4.0'
68+
androidTestImplementation "org.hamcrest:hamcrest-library:2.2"
6469
}
6570

6671
ext {

‎core/src/androidTest/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!--suppress AndroidDomInspection -->
23
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
34
package="com.cloudinary.android.test"
45
android:versionCode="1"

‎core/src/androidTest/java/com/cloudinary/android/UploaderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public void testSprite() throws Exception {
265265
final String sprite_test_tag = String.format("sprite_test_tag_%d", new java.util.Date().getTime());
266266
cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("tags", sprite_test_tag, "public_id", "sprite_test_tag_1"));
267267
cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("tags", sprite_test_tag, "public_id", "sprite_test_tag_2"));
268-
JSONObject result = new JSONObject(cloudinary.uploader().generateSprite(sprite_test_tag, ObjectUtils.emptyMap()));
268+
JSONObject result = new JSONObject(cloudinary.uploader().generateSprite(sprite_test_tag, new HashMap()));
269269
Assert.assertEquals(2, result.getJSONObject("image_infos").length());
270270
result = new JSONObject(cloudinary.uploader().generateSprite(sprite_test_tag, ObjectUtils.asMap("transformation", "w_100")));
271271
assertTrue((result.getString("css_url")).contains("w_100"));
@@ -280,7 +280,7 @@ public void testMulti() throws Exception {
280280
return;
281281
cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_1"));
282282
cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_2"));
283-
JSONObject result = new JSONObject(cloudinary.uploader().multi("multi_test_tag", ObjectUtils.emptyMap()));
283+
JSONObject result = new JSONObject(cloudinary.uploader().multi("multi_test_tag", new HashMap()));
284284
assertTrue((result.getString("url")).endsWith(".gif"));
285285
result = new JSONObject(cloudinary.uploader().multi("multi_test_tag", ObjectUtils.asMap("transformation", "w_100")));
286286
assertTrue((result.getString("url")).contains("w_100"));

‎core/src/main/java/com/cloudinary/android/ApiStrategy.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
public class ApiStrategy extends AbstractApiStrategy {
1010

11-
@SuppressWarnings("rawtypes")
1211
@Override
1312
public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String, ?> params, Map options) throws Exception {
1413
throw new Exception("Administration API is not supported for mobile applications.");

‎download/build.gradle‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.2"
4+
compileSdkVersion 31
5+
buildToolsVersion "30.0.2"
66

77
defaultConfig {
8-
minSdkVersion 14
9-
targetSdkVersion 29
8+
minSdkVersion 19
9+
targetSdkVersion 31
1010
versionCode 1
1111
versionName "1.0"
12-
12+
multiDexEnabled true
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
consumerProguardFiles 'consumer-rules.pro'
1515

@@ -23,19 +23,24 @@ android {
2323
}
2424
}
2525

26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
30+
2631
}
2732

2833
dependencies {
2934
implementation project(':core')
3035

3136
compileOnly 'com.squareup.picasso:picasso:2.71828'
32-
compileOnly 'com.facebook.fresco:fresco:2.2.0'
33-
compileOnly 'com.github.bumptech.glide:glide:4.11.0'
37+
implementation 'com.facebook.fresco:fresco:2.6.0'
38+
compileOnly 'com.github.bumptech.glide:glide:4.12.0'
3439

3540
testImplementation 'junit:junit:4.12'
36-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
37-
androidTestImplementation 'androidx.test:runner:1.2.0'
38-
androidTestImplementation 'org.mockito:mockito-android:2.24.0'
41+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
42+
androidTestImplementation 'androidx.test:runner:1.4.0'
43+
androidTestImplementation 'org.mockito:mockito-android:4.2.0'
3944
}
4045

4146
ext {

‎glide-integration/build.gradle‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.2"
4+
compileSdkVersion 31
5+
buildToolsVersion "30.0.2"
66

77
defaultConfig {
8-
minSdkVersion 14
9-
targetSdkVersion 29
8+
minSdkVersion 19
9+
targetSdkVersion 30
1010
versionCode 1
1111
versionName "1.0"
12-
12+
multiDexEnabled true
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
consumerProguardFiles 'consumer-rules.pro'
1515
}
@@ -21,16 +21,21 @@ android {
2121
}
2222
}
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
}
2530

2631
dependencies {
2732
implementation project(':core')
28-
implementation 'com.github.bumptech.glide:glide:4.11.0'
29-
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
33+
implementation 'com.github.bumptech.glide:glide:4.12.0'
34+
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
3035

3136
testImplementation 'junit:junit:4.12'
32-
androidTestImplementation 'androidx.test:runner:1.2.0'
33-
androidTestImplementation 'org.mockito:mockito-android:2.24.0'
37+
androidTestImplementation 'androidx.test:runner:1.4.0'
38+
androidTestImplementation 'org.mockito:mockito-android:4.2.0'
3439
}
3540

3641
ext {

0 commit comments

Comments
 (0)