From a41e0b86f47bab88c11e009e272f9c5f3447ee2e Mon Sep 17 00:00:00 2001 From: Jean-Michel Fayard Date: Fri, 8 Nov 2019 13:50:52 +0100 Subject: [PATCH] sample-bleeding-edge: use 0.8.3 and fix ./gradlew run --- sample-bleeding-edge/build.gradle.kts | 11 ++++------- sample-bleeding-edge/settings.gradle.kts | 2 +- .../main/kotlin/{ => de/fayard/experimental}/hello.kt | 2 +- sample-bleeding-edge/versions.properties | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) rename sample-bleeding-edge/src/main/kotlin/{ => de/fayard/experimental}/hello.kt (97%) diff --git a/sample-bleeding-edge/build.gradle.kts b/sample-bleeding-edge/build.gradle.kts index 42682b056..3932dffd2 100644 --- a/sample-bleeding-edge/build.gradle.kts +++ b/sample-bleeding-edge/build.gradle.kts @@ -1,14 +1,11 @@ -import com.louiscad.splitties.AndroidX import com.louiscad.splitties.KotlinX import com.louiscad.splitties.Testing -import de.fayard.versions.StabilityLevel -import de.fayard.versions.candidateStabilityLevel import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("de.fayard.refreshVersions") .version("0.8.2") - id("com.louiscad.splitties") .version("0.1.3") - kotlin("jvm") .version("1.3.50") + id("de.fayard.refreshVersions").version("0.8.2") + id("com.louiscad.splitties").version("0.1.3") + kotlin("jvm").version("1.3.50") application } group = "de.fayard.experimental" @@ -35,7 +32,7 @@ repositories { tasks.named("run") { - main = "de.fayard.experimental.HelloKt.main" + main = "de.fayard.experimental.HelloKt" } tasks.register("hello") { diff --git a/sample-bleeding-edge/settings.gradle.kts b/sample-bleeding-edge/settings.gradle.kts index 4facbe914..4ec63688c 100644 --- a/sample-bleeding-edge/settings.gradle.kts +++ b/sample-bleeding-edge/settings.gradle.kts @@ -7,7 +7,7 @@ buildscript { } // Didn't find a way to use classpath from composite build, so we are hardcoding a // version expected to be released in one of the configured repositories. - dependencies.classpath("de.fayard:refreshVersions:0.8.2") + dependencies.classpath("de.fayard:refreshVersions:0.8.3") } pluginManagement { plugins { diff --git a/sample-bleeding-edge/src/main/kotlin/hello.kt b/sample-bleeding-edge/src/main/kotlin/de/fayard/experimental/hello.kt similarity index 97% rename from sample-bleeding-edge/src/main/kotlin/hello.kt rename to sample-bleeding-edge/src/main/kotlin/de/fayard/experimental/hello.kt index 4af871668..6762bfecd 100644 --- a/sample-bleeding-edge/src/main/kotlin/hello.kt +++ b/sample-bleeding-edge/src/main/kotlin/de/fayard/experimental/hello.kt @@ -2,4 +2,4 @@ package de.fayard.experimental fun main() { println("Hello World!") -} \ No newline at end of file +} diff --git a/sample-bleeding-edge/versions.properties b/sample-bleeding-edge/versions.properties index 76a0a8d68..6bd08b45d 100644 --- a/sample-bleeding-edge/versions.properties +++ b/sample-bleeding-edge/versions.properties @@ -8,12 +8,11 @@ # See https://github.com/jmfayard/buildSrcVersions/issues/77 module.kotlin=1.3.50 plugin.com.github.ben-manes.versions=0.25.0 -plugin.de.fayard.refreshVersions=0.8.2 +plugin.de.fayard.refreshVersions=0.8.3 plugin.org.jetbrains.kotlin.jvm=1.3.50 # # available=1.3.60-eap-143 plugin.com.louiscad.splitties=0.1.3 version.org.jetbrains.kotlinx.kotlinx-coroutines=1.3.2 version.org.jetbrains.kotlin=1.3.50 -# # available=1.3.60-eap-143 version.io.kotestArtifact=3.4.2 version.gradleLatestVersion=5.6.4