Skip to content

Commit d18b1cd

Browse files
committed
Bump gradle version
1 parent fc65a88 commit d18b1cd

File tree

21 files changed

+53
-19
lines changed

21 files changed

+53
-19
lines changed

all/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
android {
4+
namespace 'com.cloudinary.android.all'
45
compileSdk 34
56

67

all/src/main/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
<manifest package="com.cloudinary.android" />
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
3+
<!-- rest of manifest -->
4+
</manifest>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ allprojects {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.1.2'
11+
classpath 'com.android.tools.build:gradle:8.3.0'
1212
classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
1313
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"
1414
classpath 'digital.wup:android-maven-publish:3.6.2'

core/build.gradle

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

33
android {
4+
namespace 'com.cloudinary.android.core'
5+
testNamespace 'com.cloudinary.android.test'
46
compileSdk 34
57

68

core/src/androidTest/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--suppress AndroidDomInspection -->
33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="com.cloudinary.android.test"
54
android:versionCode="1"
65
android:versionName="1.0">
76

core/src/androidTest/java/com/cloudinary/android/PayloadTest.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
import com.cloudinary.android.payload.Payload;
1212
import com.cloudinary.android.payload.PayloadFactory;
1313
import com.cloudinary.android.payload.PayloadNotFoundException;
14-
import com.cloudinary.android.payload.ResourcePayload;
1514

1615
import org.junit.BeforeClass;
1716
import org.junit.Test;
1817
import org.junit.runner.RunWith;
1918

2019
import java.io.File;
2120
import java.io.FileInputStream;
21+
import java.io.FileOutputStream;
2222
import java.io.IOException;
23+
import java.io.InputStream;
24+
import java.io.OutputStream;
2325

2426
import static junit.framework.Assert.assertEquals;
2527

@@ -64,11 +66,27 @@ public void testBytesPayload() throws PayloadNotFoundException, IOException {
6466
}
6567

6668
@Test
67-
public void testResourcePayload() throws PayloadNotFoundException {
68-
ResourcePayload payload = new ResourcePayload(com.cloudinary.android.core.test.R.raw.old_logo);
69+
public void testResourcePayload() throws PayloadNotFoundException, IOException {
70+
InputStream is = InstrumentationRegistry.getInstrumentation()
71+
.getContext()
72+
.getAssets()
73+
.open("images/old_logo.png");
74+
75+
File tempFile = File.createTempFile("old_logo", ".png");
76+
77+
try (OutputStream os = new FileOutputStream(tempFile)) {
78+
byte[] buffer = new byte[1024];
79+
int length;
80+
while ((length = is.read(buffer)) > 0) {
81+
os.write(buffer, 0, length); // ✅ the actual fix
82+
}
83+
}
84+
85+
Payload<String> payload = new FilePayload(tempFile.getAbsolutePath());
6986
verifyLengthAndRecreation(payload, 3381);
7087
}
7188

89+
7290
private void verifyLengthAndRecreation(Payload payload, long expectedLength) throws PayloadNotFoundException {
7391
assertEquals(expectedLength, payload.getLength(InstrumentationRegistry.getInstrumentation().getContext()));
7492

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public static void setUp() throws Exception {
5151
String url = Utils.cloudinaryUrlFromContext(InstrumentationRegistry.getInstrumentation().getContext());
5252
cloudinary = new Cloudinary(url);
5353
cloudinary.config.analytics = false;
54+
cloudinary.config.secure = false;
5455
if (StringUtils.isBlank(url)) {
5556
throw new IllegalArgumentException("UploaderTest - No cloudinary url configured");
5657
}

core/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.cloudinary.android.core">
2+
>
33

44
<uses-permission android:name="android.permission.INTERNET" />
55
<application />

download/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apply plugin: 'com.android.library'
22

33
android {
4+
namespace 'com.cloudinary.android.download'
5+
testNamespace 'com.cloudinary.android.download.test'
46
compileSdk 34
57

68
defaultConfig {
@@ -37,7 +39,7 @@ dependencies {
3739
testImplementation 'junit:junit:4.12'
3840
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
3941
androidTestImplementation 'androidx.test:runner:1.4.0'
40-
androidTestImplementation 'org.mockito:mockito-android:4.2.0'
42+
androidTestImplementation 'org.mockito:mockito-android:5.11.0'
4143
}
4244

4345
ext {

download/src/androidTest/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.cloudinary.android.download.test"
43
android:versionCode="1"
54
android:versionName="1.0">
65

0 commit comments

Comments
 (0)