Merge pull request #176 from Tinkoff/v2.12

V2.12
tinkoff-mobile-tech · Dec 29, 2022 · 1cbf5ef · 1cbf5ef
2 parents 41777f3 + 10e64e1
commit 1cbf5ef
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 VERSION_NAME=2.12.0
-VERSION_CODE=18
+VERSION_CODE=19
 GROUP=ru.tinkoff.acquiring
 
 POM_DESCRIPTION=Library which allows you to use internet acquiring in your android app
@@ -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
+android.enableJetifier=true
diff --git 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
@@ -1,3 +1,7 @@
+2.12.0
+Изменена версия minSdk всвязи самоподписными сертификатами:
+minSdk : `21` -`24`
+
 2.10.0
 
 Изменены имена некоторых атрибутов:

diff --git 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/sample/src/main/res/xml/network_security_config.xml b/sample/src/main/res/xml/network_security_config.xml
@@ -5,4 +5,9 @@
         <certificates src="@raw/acq_tinkoff_root_cert" />
         <certificates src="@raw/acq_ministry_of_digital_development_root_cert" />
     </base-config>
+    <debug-overrides>
+        <trust-anchors>
+            <certificates src="user" />
+        </trust-anchors>
+    </debug-overrides>
 </network-security-config>
diff --git 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