From 4a250c89cf138deae5a1653f52b662150f925039 Mon Sep 17 00:00:00 2001 From: Anastasia Koreshkova Date: Mon, 14 Aug 2023 17:45:22 +0700 Subject: [PATCH 1/4] =?UTF-8?q?MK-13753=20[SDK]=20=D0=9E=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20=D0=BE=D1=82=20=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=20kotlin-android-extension?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 ++--- dependencies.gradle | 3 +-- integration-demo-payments/build.gradle | 1 - integration-demo/build.gradle | 1 - integration-library/build.gradle | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 3463801..216a5f5 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.3.72" + classpath gradlePlugins.android + classpath gradlePlugins.kotlin } } diff --git a/dependencies.gradle b/dependencies.gradle index 828517a..3720f8e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,12 +2,11 @@ ext.versions = [minSdk : 21, targetSdk : 32, compileSdk: 32, buildTools: '32.0.0', - kotlin : '1.3.72',] + kotlin : '1.4.20',] ext.gradlePlugins = [android : 'com.android.tools.build:gradle:7.1.3', grgit : 'org.ajoberstar:grgit:1.1.0', kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin", - kotlinExtensions: "org.jetbrains.kotlin:kotlin-android-extensions:$versions.kotlin", sonar : "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1", jacoco : 'org.jacoco:org.jacoco.core:0.8.6', jacocoReports : 'org.jacoco:org.jacoco.report:0.8.6'] diff --git a/integration-demo-payments/build.gradle b/integration-demo-payments/build.gradle index 9437adc..9df5f44 100644 --- a/integration-demo-payments/build.gradle +++ b/integration-demo-payments/build.gradle @@ -1,7 +1,6 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' } Properties localProperties = new Properties() diff --git a/integration-demo/build.gradle b/integration-demo/build.gradle index 44ac824..d161343 100644 --- a/integration-demo/build.gradle +++ b/integration-demo/build.gradle @@ -1,7 +1,6 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' } Properties localProperties = new Properties() diff --git a/integration-library/build.gradle b/integration-library/build.gradle index e2981ad..2f3aafe 100644 --- a/integration-library/build.gradle +++ b/integration-library/build.gradle @@ -1,7 +1,6 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-android-extensions' id 'maven-publish' id 'org.jetbrains.dokka' version '1.6.10' id 'signing' From 37a96e4a4d3a2d927be0fa393a48eac203aac4ff Mon Sep 17 00:00:00 2001 From: Anastasia Koreshkova Date: Mon, 14 Aug 2023 18:05:05 +0700 Subject: [PATCH 2/4] apply from: 'dependencies.gradle' --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 216a5f5..cde2fe1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ buildscript { // Gradle will not find vars defined in an external file when referring to them // in the buildscript block, unless you link it from the buildscript block, too. + apply from: 'dependencies.gradle' repositories { mavenCentral() @@ -15,10 +16,7 @@ buildscript { } } -apply from: 'dependencies.gradle' - allprojects { - repositories { google() mavenCentral() From b72ace98f45889dab4e02543098573757474b847 Mon Sep 17 00:00:00 2001 From: Anastasia Koreshkova Date: Mon, 14 Aug 2023 18:45:12 +0700 Subject: [PATCH 3/4] https://nexus.moduldev.ru/repository/android/ --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index cde2fe1..5813a8d 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,10 @@ buildscript { allprojects { repositories { + maven { + url 'https://nexus.moduldev.ru/repository/android/' + name 'Modulbank Android' + } google() mavenCentral() flatDir { From 8dcf3dd68b3b26ef538153052cda09b47f3370bd Mon Sep 17 00:00:00 2001 From: Anastasia Koreshkova Date: Mon, 14 Aug 2023 22:41:35 +0700 Subject: [PATCH 4/4] fix tests --- .../pos/integration/intent/PrintCheckIntentTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-library/src/test/java/ru/modulkassa/pos/integration/intent/PrintCheckIntentTest.kt b/integration-library/src/test/java/ru/modulkassa/pos/integration/intent/PrintCheckIntentTest.kt index f201767..776ab56 100644 --- a/integration-library/src/test/java/ru/modulkassa/pos/integration/intent/PrintCheckIntentTest.kt +++ b/integration-library/src/test/java/ru/modulkassa/pos/integration/intent/PrintCheckIntentTest.kt @@ -34,7 +34,7 @@ class PrintCheckIntentTest { val exception = assertFailsWith { PrintCheckIntent.checkFromIntent(intent) } assertThat(exception.body, equalTo("")) - assertThat(exception.cause, instanceOf(IllegalStateException::class.java)) + assertThat(exception.cause, instanceOf(NullPointerException::class.java)) } @Test @@ -46,7 +46,7 @@ class PrintCheckIntentTest { val exception = assertFailsWith { PrintCheckIntent.checkFromIntent(intent) } assertThat(exception.body, equalTo("null")) - assertThat(exception.cause, instanceOf(IllegalStateException::class.java)) + assertThat(exception.cause, instanceOf(NullPointerException::class.java)) } @Test @@ -82,7 +82,7 @@ class PrintCheckIntentTest { val exception = assertFailsWith { PrintCheckIntent.checkFromIntent(intent) } assertThat(exception.body, nullValue()) - assertThat(exception.cause, instanceOf(IllegalStateException::class.java)) + assertThat(exception.cause, instanceOf(NullPointerException::class.java)) } @Test