Merge pull request #750 from appwrite/lohanidamodar-patch-2

upgrade okhttp in android sdk

Author: abnegate

templates/android/library/build.gradle.twig

@@ -22,11 +22,11 @@ ext {
 version PUBLISH_VERSION
 
 android {
-    compileSdkVersion(33)
+    compileSdkVersion(34)
 
     defaultConfig {
         minSdkVersion(21)
-        targetSdkVersion(33)
+        targetSdkVersion(34)
         versionCode = 1
         versionName = "1.0"
         buildConfigField "String", "SDK_VERSION", "\"${PUBLISH_VERSION}\""
@@ -57,7 +57,7 @@ dependencies {
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
 
-    api(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
+    api(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
     api("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:okhttp-urlconnection")
     implementation("com.squareup.okhttp3:logging-interceptor")
@@ -77,4 +77,4 @@ dependencies {
     testApi("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1")
 }
 
-apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
+apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"

tests/Android14Java11Test.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests;
+
+class Android14Java11Test extends Base
+{
+    protected string $sdkName = 'android';
+    protected string $sdkPlatform = 'client';
+    protected string $sdkLanguage = 'android';
+    protected string $version = '0.0.1';
+
+    protected string $language = 'android';
+    protected string $class = 'Appwrite\SDK\Language\Android';
+    protected array $build = [
+        'mkdir -p tests/sdks/android/library/src/test/java',
+        'cp tests/languages/android/Tests.kt tests/sdks/android/library/src/test/java/Tests.kt',
+        'chmod +x tests/sdks/android/gradlew',
+    ];
+    protected string $command =
+        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/android alvrme/alpine-android:android-34-jdk11 sh -c "./gradlew :library:testReleaseUnitTest --stacktrace -q && cat library/result.txt"';
+
+    protected array $expectedOutput = [
+        ...Base::FOO_RESPONSES,
+        ...Base::BAR_RESPONSES,
+        ...Base::GENERAL_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::EXCEPTION_RESPONSES,
+        ...Base::REALTIME_RESPONSES,
+        // ...Base::COOKIE_RESPONSES,
+        ...Base::QUERY_HELPER_RESPONSES,
+        ...Base::PERMISSION_HELPER_RESPONSES,
+        ...Base::ID_HELPER_RESPONSES
+    ];
+}

tests/Android14Java8Test.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests;
+
+class Android14Java8Test extends Base
+{
+    protected string $sdkName = 'android';
+    protected string $sdkPlatform = 'client';
+    protected string $sdkLanguage = 'android';
+    protected string $version = '0.0.1';
+
+    protected string $language = 'android';
+    protected string $class = 'Appwrite\SDK\Language\Android';
+    protected array $build = [
+        'mkdir -p tests/sdks/android/library/src/test/java',
+        'cp tests/languages/android/Tests.kt tests/sdks/android/library/src/test/java/Tests.kt',
+        'chmod +x tests/sdks/android/gradlew',
+    ];
+    protected string $command =
+        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/android alvrme/alpine-android:android-34-jdk8 sh -c "./gradlew :library:testReleaseUnitTest --stacktrace -q && cat library/result.txt"';
+
+    protected array $expectedOutput = [
+        ...Base::FOO_RESPONSES,
+        ...Base::BAR_RESPONSES,
+        ...Base::GENERAL_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::EXCEPTION_RESPONSES,
+        ...Base::REALTIME_RESPONSES,
+        // ...Base::COOKIE_RESPONSES,
+        ...Base::QUERY_HELPER_RESPONSES,
+        ...Base::PERMISSION_HELPER_RESPONSES,
+        ...Base::ID_HELPER_RESPONSES
+    ];
+}