From 9e5ac7d76491fab6c2bec8c3fe646f29146d5d88 Mon Sep 17 00:00:00 2001 From: Salomon BRYS Date: Fri, 16 Sep 2022 15:24:20 +0200 Subject: [PATCH] test projet fixes --- .../tests-Android/gradle/wrapper/gradle-wrapper.properties | 2 +- tests-projects/tests-Android/settings.gradle.kts | 2 +- .../tests-Jvm/gradle/wrapper/gradle-wrapper.properties | 2 +- tests-projects/tests-Jvm/settings.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests-projects/tests-Android/gradle/wrapper/gradle-wrapper.properties b/tests-projects/tests-Android/gradle/wrapper/gradle-wrapper.properties index 202eea7..3328e3c 100644 --- a/tests-projects/tests-Android/gradle/wrapper/gradle-wrapper.properties +++ b/tests-projects/tests-Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 24 12:07:09 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/tests-projects/tests-Android/settings.gradle.kts b/tests-projects/tests-Android/settings.gradle.kts index 1786e5b..9f02902 100644 --- a/tests-projects/tests-Android/settings.gradle.kts +++ b/tests-projects/tests-Android/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { resolutionStrategy.eachPlugin { if (target.id.id == "org.kodein.mock.mockmp") { val rx = Regex("version = \"(.+)\"") - val match = file("$rootDir/../build.gradle.kts").useLines { lines -> + val match = file("$rootDir/../../build.gradle.kts").useLines { lines -> lines.mapNotNull { rx.matchEntire(it.trim()) }.firstOrNull() } ?: error("Could not find parent project version") val mockmpVersion = match.groupValues[1] diff --git a/tests-projects/tests-Jvm/gradle/wrapper/gradle-wrapper.properties b/tests-projects/tests-Jvm/gradle/wrapper/gradle-wrapper.properties index 202eea7..3328e3c 100644 --- a/tests-projects/tests-Jvm/gradle/wrapper/gradle-wrapper.properties +++ b/tests-projects/tests-Jvm/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 24 12:07:09 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/tests-projects/tests-Jvm/settings.gradle.kts b/tests-projects/tests-Jvm/settings.gradle.kts index e02d89e..6620d69 100644 --- a/tests-projects/tests-Jvm/settings.gradle.kts +++ b/tests-projects/tests-Jvm/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { resolutionStrategy.eachPlugin { if (target.id.id == "org.kodein.mock.mockmp") { val rx = Regex("version = \"(.+)\"") - val match = file("$rootDir/../build.gradle.kts").useLines { lines -> + val match = file("$rootDir/../../build.gradle.kts").useLines { lines -> lines.mapNotNull { rx.matchEntire(it.trim()) }.firstOrNull() } ?: error("Could not find parent project version") val mockmpVersion = match.groupValues[1]