Merge pull request #61 from allure-framework/bump_gradlePlugin

bump gradlePlugin version, fix typo in kotlinxSerialization
allure-framework · May 28, 2021 · ea1f9d4 · ea1f9d4
2 parents ca8d85c + 5058875
commit ea1f9d4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/allure-kotlin-android/src/main/kotlin/io/qameta/allure/android/internal/TestUtils.kt b/allure-kotlin-android/src/main/kotlin/io/qameta/allure/android/internal/TestUtils.kt
@@ -17,7 +17,7 @@ import java.io.File
  */
 @SuppressLint("DefaultLocale")
 internal fun isDeviceTest(): Boolean =
-    System.getProperty("java.runtime.name")?.toLowerCase()?.contains("android") ?: false
+    System.getProperty("java.runtime.name")?.lowercase()?.contains("android") ?: false
 
 internal fun requestExternalStoragePermissions() {
     when {

diff --git a/allure-kotlin-commons/build.gradle.kts b/allure-kotlin-commons/build.gradle.kts
@@ -3,7 +3,7 @@ description = "Allure Kotlin Commons"
 dependencies {
     api(project(":allure-kotlin-model"))
     implementation(kotlin("reflect"))
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kontlinxSerialization}")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}")
     testImplementation("io.github.benas:random-beans:${Versions.randomBeans}")
     testImplementation("io.github.glytching:junit-extensions:${Versions.junitExtensions}")
     testImplementation("org.assertj:assertj-core:${Versions.assertJ}")

diff --git a/allure-kotlin-model/build.gradle.kts b/allure-kotlin-model/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kontlinxSerialization}")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}")
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     const val kotlin = "1.5.0"
-    const val kontlinxSerialization = "1.2.1"
+    const val kotlinxSerialization = "1.2.1"
 
     const val junit4 = "4.13.2"
     const val junit5 = "5.5.2"
@@ -13,7 +13,7 @@ object Versions {
     const val randomBeans = "3.9.0"
 
     object Android {
-        const val gradlePlugin = "4.1.3"
+        const val gradlePlugin = "4.2.1"
 
         const val compileSdk = 30
         const val targetSdk = 30

diff --git a/gradle.properties b/gradle.properties
@@ -4,3 +4,4 @@ android.useAndroidX=true
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.jvmargs=-Xmx4096M