diff --git a/app/build.gradle b/app/build.gradle index 16c6ab7..f9104bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,12 +55,12 @@ android { compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } namespace 'ru.cloudpayments.demo' } @@ -98,14 +98,14 @@ def getGitCurrentBranch() { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.10.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0-beta01' + 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.9.0' - implementation 'androidx.fragment:fragment-ktx:1.5.5' + implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.fragment:fragment-ktx:1.5.6' 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 d028fa0..7c03b2a 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 '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.10' apply false + 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 } task clean(type: Delete) { @@ -10,9 +10,9 @@ task clean(type: Delete) { } ext { - kotlin_version = "1.7.20" + kotlin_version = '1.8.10' retrofitVersion = '2.9.0' okHttp3Version = '4.5.0' rxBindingVersion = '2.2.0' - dagger2Version = '2.42' + dagger2Version = '2.45' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6c02113..c6a0197 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 28 13:58:18 SAMT 2020 +#Fri Apr 14 15:38:48 YEKT 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/sdk/build.gradle b/sdk/build.gradle index 4c7f2b8..2820609 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -21,6 +21,10 @@ android { enabled = true } + buildFeatures { + buildConfig = true + } + buildTypes { debug { minifyEnabled true @@ -35,12 +39,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } namespace 'ru.cloudpayments.sdk' } @@ -48,14 +52,14 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.10.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0-beta01' + 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.9.0' - implementation 'androidx.fragment:fragment-ktx:1.5.5' + implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.fragment:fragment-ktx:1.5.6' implementation 'androidx.arch.core:core-runtime:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/configuration/CloudpaymentsSDK.kt b/sdk/src/main/java/ru/cloudpayments/sdk/configuration/CloudpaymentsSDK.kt index 2f31fad..b77d292 100644 --- a/sdk/src/main/java/ru/cloudpayments/sdk/configuration/CloudpaymentsSDK.kt +++ b/sdk/src/main/java/ru/cloudpayments/sdk/configuration/CloudpaymentsSDK.kt @@ -17,7 +17,6 @@ import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory import retrofit2.converter.gson.GsonConverterFactory -import ru.cloudpayments.sdk.BuildConfig import ru.cloudpayments.sdk.Constants import ru.cloudpayments.sdk.api.AuthenticationInterceptor import ru.cloudpayments.sdk.api.CloudpaymentsApiService diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/util/Constants.kt b/sdk/src/main/java/ru/cloudpayments/sdk/util/Constants.kt index de08249..edbbd55 100644 --- a/sdk/src/main/java/ru/cloudpayments/sdk/util/Constants.kt +++ b/sdk/src/main/java/ru/cloudpayments/sdk/util/Constants.kt @@ -1,7 +1,6 @@ package ru.cloudpayments.sdk.util import com.google.android.gms.wallet.WalletConstants -import org.json.JSONArray import ru.cloudpayments.sdk.BuildConfig val GOOGLE_PAY_ENVIRONMENT = if (BuildConfig.DEBUG)