Merge pull request #22 from Liftric/refactor/build-gradle

refactor(gradle): dependencies

Author: gaebel

build.gradle.kts

@@ -3,15 +3,8 @@ buildscript {
         mavenCentral()
         google()
     }
+
     dependencies {
         classpath(Libs.AndroidGradleTools)
-        classpath(kotlin(Libs.GradlePlugin, version = Versions.Kotlin))
-    }
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
     }
-}
+}

buildSrc/src/main/java/Libs.kt

@@ -16,7 +16,6 @@ object Versions {
 
 object Libs {
     const val Signing = "signing"
-    const val GradlePlugin = "gradle-plugin"
     const val AndroidGradleTools = "com.android.tools.build:gradle:${Versions.Gradle}"
     const val AndroidLibrary = "com.android.library"
     const val Multiplatform = "multiplatform"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kvault/build.gradle.kts

@@ -1,13 +1,18 @@
-import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
+import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
 
 plugins {
     id(Libs.AndroidLibrary)
-    kotlin(Libs.Multiplatform)
+    kotlin(Libs.Multiplatform) version Versions.Kotlin
     id(Libs.MavenPublish)
     id(Libs.Versioning) version Versions.Versioning
     id(Libs.Signing)
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 kotlin {
     ios {
         binaries.framework()
@@ -49,9 +54,10 @@ kotlin {
         }
     }
 }
-
-tasks.withType(KotlinNativeTest::class).named("iosX64Test") {
-    filter.setExcludePatterns("com.liftric.kvault.KVaultTest")
+tasks {
+    val iosX64Test by existing(KotlinNativeSimulatorTest::class) {
+        filter.excludeTestsMatching("com.liftric.kvault.KVaultTest")
+    }
 }
 
 android {