Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Fix http connection error
Browse files Browse the repository at this point in the history
  • Loading branch information
a.ignatov committed Apr 26, 2023
1 parent 6db50e5 commit bddef16
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 20 deletions.
11 changes: 5 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// 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) {
delete rootProject.buildDir
}

ext {
kotlin_version = '1.8.10'
kotlin_version = "1.7.20"
retrofitVersion = '2.9.0'
okHttp3Version = '4.5.0'
rxBindingVersion = '2.2.0'
Expand Down
15 changes: 5 additions & 10 deletions sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ android {
enabled = true
}

buildFeatures {
buildConfig = true
}

buildTypes {
debug {
minifyEnabled true
Expand All @@ -39,27 +35,26 @@ 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'
}

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'
Expand Down

0 comments on commit bddef16

Please sign in to comment.