From bddef16d728ac0893ccaae37fa49a40d3a0a64e5 Mon Sep 17 00:00:00 2001 From: "a.ignatov" <> Date: Wed, 26 Apr 2023 16:31:18 +0500 Subject: [PATCH] Fix http connection error --- app/build.gradle | 11 +++++------ build.gradle | 8 ++++---- sdk/build.gradle | 15 +++++---------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f9104bf..6b3e15a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,12 +55,12 @@ android { compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JavaVersion.VERSION_1_8.toString() } namespace 'ru.cloudpayments.demo' } @@ -98,14 +98,13 @@ def getGitCurrentBranch() { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.core:core-ktx:1.10.0' - implementation 'androidx.fragment:fragment-ktx:1.5.6' + implementation 'androidx.fragment:fragment-ktx:1.5.7' implementation 'androidx.arch.core:core-runtime:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' diff --git a/build.gradle b/build.gradle index 7c03b2a..2fd3215 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.0' apply false - id 'com.android.library' version '8.0.0' apply false - id 'org.jetbrains.kotlin.android' version '1.8.10' apply false + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { @@ -10,7 +10,7 @@ task clean(type: Delete) { } ext { - kotlin_version = '1.8.10' + kotlin_version = "1.7.20" retrofitVersion = '2.9.0' okHttp3Version = '4.5.0' rxBindingVersion = '2.2.0' diff --git a/sdk/build.gradle b/sdk/build.gradle index 2820609..fd4a379 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -21,10 +21,6 @@ android { enabled = true } - buildFeatures { - buildConfig = true - } - buildTypes { debug { minifyEnabled true @@ -39,12 +35,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JavaVersion.VERSION_1_8.toString() } namespace 'ru.cloudpayments.sdk' } @@ -52,14 +48,13 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.core:core-ktx:1.10.0' - implementation 'androidx.fragment:fragment-ktx:1.5.6' + implementation 'androidx.fragment:fragment-ktx:1.5.7' implementation 'androidx.arch.core:core-runtime:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'