From 58b8abda1bf5c599bf2b0d8028707bfc643a6684 Mon Sep 17 00:00:00 2001 From: jqwout Date: Thu, 29 Dec 2022 17:10:42 +0300 Subject: [PATCH 1/2] Charles certs enable for debug --- gradle.properties | 2 +- sample/src/main/res/xml/network_security_config.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 57c89857..07addd6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ VERSION_NAME=2.12 -VERSION_CODE=18 +VERSION_CODE=19 GROUP=ru.tinkoff.acquiring POM_DESCRIPTION=Library which allows you to use internet acquiring in your android app diff --git a/sample/src/main/res/xml/network_security_config.xml b/sample/src/main/res/xml/network_security_config.xml index 1a767bf5..e8ab97bf 100644 --- a/sample/src/main/res/xml/network_security_config.xml +++ b/sample/src/main/res/xml/network_security_config.xml @@ -5,4 +5,9 @@ + + + + + \ No newline at end of file From 10e64e111bcc7a6f530dd4d8797136c9135eb533 Mon Sep 17 00:00:00 2001 From: jqwout Date: Thu, 29 Dec 2022 18:07:53 +0300 Subject: [PATCH 2/2] update changelog.md and sync min versions with yandex --- changelog.md | 9 +++++++++ gradle.properties | 8 +++----- gradle/versions.gradle | 1 - migration.md | 4 ++++ sample/build.gradle | 2 +- yandexpay/build.gradle | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/changelog.md b/changelog.md index 6cfaedab..33bf64cc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,12 @@ +## 2.12.0 + +#### Fixed +#### Changes +- !up minSdk version to 24! +- network config for self-signed certs +- add tinkoff and min.digital self-signed certs in ui module +#### Additions + ## 2.11.0 #### Fixed diff --git a/gradle.properties b/gradle.properties index 89992eb1..712eb365 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=2.12 +VERSION_NAME=2.12.0 VERSION_CODE=19 GROUP=ru.tinkoff.acquiring @@ -13,9 +13,7 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=tcs POM_DEVELOPER_NAME=Tinkoff Credit Systems org.gradle.daemon=true -org.gradle.jvmargs=-Xmx8096m -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx8096m -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m android.useAndroidX=true -android.enableJetifier=true - -org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m \ No newline at end of file +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 061aa7a1..57a65cda 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -4,7 +4,6 @@ ext { compileSdk = 31 minSdk = 24 - yandexPayMinSdk = 24 targetSdk = 31 buildTools = '30.0.3' diff --git a/migration.md b/migration.md index 1a92b28e..fe417211 100644 --- a/migration.md +++ b/migration.md @@ -1,3 +1,7 @@ +2.12.0 +Изменена версия minSdk всвязи самоподписными сертификатами: +minSdk : `21` -`24` + 2.10.0 Изменены имена некоторых атрибутов: diff --git a/sample/build.gradle b/sample/build.gradle index fbec59c7..04ab21e2 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -18,7 +18,7 @@ android { defaultConfig { applicationId "ru.tinkoff.acquiring.sample" - minSdkVersion rootProject.yandexPayMinSdk + minSdkVersion rootProject.minSdk targetSdkVersion rootProject.compileSdk versionCode Integer.parseInt(VERSION_CODE) versionName VERSION_NAME diff --git a/yandexpay/build.gradle b/yandexpay/build.gradle index fefcd703..72eb50c8 100644 --- a/yandexpay/build.gradle +++ b/yandexpay/build.gradle @@ -10,7 +10,7 @@ android { buildToolsVersion rootProject.buildTools defaultConfig { - minSdkVersion rootProject.yandexPayMinSdk + minSdkVersion rootProject.minSdk targetSdkVersion rootProject.targetSdk versionCode Integer.parseInt(VERSION_CODE) versionName VERSION_NAME