Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MK-13753 [SDK] Отказаться от плагина kotlin-android-extensions #43

Merged
merged 4 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@
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()
google()
}

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
}
}

apply from: 'dependencies.gradle'

allprojects {

repositories {
maven {
url 'https://nexus.moduldev.ru/repository/android/'
name 'Modulbank Android'
}
google()
mavenCentral()
flatDir {
Expand Down
3 changes: 1 addition & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
1 change: 0 additions & 1 deletion integration-demo-payments/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-android-extensions'
}

Properties localProperties = new Properties()
Expand Down
1 change: 0 additions & 1 deletion integration-demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-android-extensions'
}

Properties localProperties = new Properties()
Expand Down
1 change: 0 additions & 1 deletion integration-library/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class PrintCheckIntentTest {
val exception = assertFailsWith<InvalidCheckBodyException> { PrintCheckIntent.checkFromIntent(intent) }

assertThat(exception.body, equalTo(""))
assertThat(exception.cause, instanceOf(IllegalStateException::class.java))
assertThat(exception.cause, instanceOf(NullPointerException::class.java))
}

@Test
Expand All @@ -46,7 +46,7 @@ class PrintCheckIntentTest {
val exception = assertFailsWith<InvalidCheckBodyException> { PrintCheckIntent.checkFromIntent(intent) }

assertThat(exception.body, equalTo("null"))
assertThat(exception.cause, instanceOf(IllegalStateException::class.java))
assertThat(exception.cause, instanceOf(NullPointerException::class.java))
}

@Test
Expand Down Expand Up @@ -82,7 +82,7 @@ class PrintCheckIntentTest {
val exception = assertFailsWith<InvalidCheckBodyException> { PrintCheckIntent.checkFromIntent(intent) }

assertThat(exception.body, nullValue())
assertThat(exception.cause, instanceOf(IllegalStateException::class.java))
assertThat(exception.cause, instanceOf(NullPointerException::class.java))
}

@Test
Expand Down