Skip to content

Commit ea1f9d4

Browse files
authored
Merge pull request #61 from allure-framework/bump_gradlePlugin
bump gradlePlugin version, fix typo in kotlinxSerialization
2 parents ca8d85c + 5058875 commit ea1f9d4

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

allure-kotlin-android/src/main/kotlin/io/qameta/allure/android/internal/TestUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import java.io.File
1717
*/
1818
@SuppressLint("DefaultLocale")
1919
internal fun isDeviceTest(): Boolean =
20-
System.getProperty("java.runtime.name")?.toLowerCase()?.contains("android") ?: false
20+
System.getProperty("java.runtime.name")?.lowercase()?.contains("android") ?: false
2121

2222
internal fun requestExternalStoragePermissions() {
2323
when {

allure-kotlin-commons/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = "Allure Kotlin Commons"
33
dependencies {
44
api(project(":allure-kotlin-model"))
55
implementation(kotlin("reflect"))
6-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kontlinxSerialization}")
6+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}")
77
testImplementation("io.github.benas:random-beans:${Versions.randomBeans}")
88
testImplementation("io.github.glytching:junit-extensions:${Versions.junitExtensions}")
99
testImplementation("org.assertj:assertj-core:${Versions.assertJ}")

allure-kotlin-model/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ plugins {
55
}
66

77
dependencies {
8-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kontlinxSerialization}")
8+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}")
99
}

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Versions {
22
const val kotlin = "1.5.0"
3-
const val kontlinxSerialization = "1.2.1"
3+
const val kotlinxSerialization = "1.2.1"
44

55
const val junit4 = "4.13.2"
66
const val junit5 = "5.5.2"
@@ -13,7 +13,7 @@ object Versions {
1313
const val randomBeans = "3.9.0"
1414

1515
object Android {
16-
const val gradlePlugin = "4.1.3"
16+
const val gradlePlugin = "4.2.1"
1717

1818
const val compileSdk = 30
1919
const val targetSdk = 30

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ android.useAndroidX=true
44
org.gradle.caching=true
55
org.gradle.parallel=true
66
org.gradle.vfs.watch=true
7+
org.gradle.jvmargs=-Xmx4096M

0 commit comments

Comments
 (0)