From b71b42d945007a4904d82f0e15b27806593c3769 Mon Sep 17 00:00:00 2001 From: nikky Date: Mon, 24 May 2021 16:50:39 +0200 Subject: [PATCH] downgrade gradle again --- .gitignore | 1 + buildUtil/build.gradle.kts | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 32 +++++++---------- versions.properties | 44 ++++++++++++++++++------ 5 files changed, 49 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 245e0194..af92324e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ logs/ /run/ version.txt +buildscan.log profile/ diff --git a/buildUtil/build.gradle.kts b/buildUtil/build.gradle.kts index c8c66b78..1b05cb89 100644 --- a/buildUtil/build.gradle.kts +++ b/buildUtil/build.gradle.kts @@ -5,7 +5,6 @@ plugins { } repositories { - jcenter() mavenCentral() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..549d8442 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index f46b6841..08be4323 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,15 +1,7 @@ -import de.fayard.refreshVersions.bootstrapRefreshVersions pluginManagement { repositories { - maven(url = "https://dl.bintray.com/kotlin/kotlin-eap") { - name = "Kotlin EAP" - } - maven(url = "https://kotlin.bintray.com/kotlinx") { - name = "kotlinx" - } mavenCentral() gradlePluginPortal() - mavenLocal() } // resolutionStrategy { // eachPlugin { @@ -19,26 +11,28 @@ pluginManagement { // } // } } -buildscript { - repositories { - gradlePluginPortal() - } - dependencies.classpath("de.fayard.refreshVersions:refreshVersions:0.9.7") -} -bootstrapRefreshVersions( - listOf(rootDir.resolve("dependencies-rules.txt").readText()) -) plugins { - id("com.gradle.enterprise").version("3.6") + id("com.gradle.enterprise") version "3.6" + + +//// # available:"3.6.1" + id("de.fayard.refreshVersions") version "0.10.0" +} + +refreshVersions { + extraArtifactVersionKeyRules(file("dependencies-rules.txt")) } gradleEnterprise { buildScan { +// publishAlwaysIf(true) termsOfServiceUrl = "https://gradle.com/terms-of-service" termsOfServiceAgree = "yes" -// publishAlwaysIf(true) + buildScanPublished { + file("buildscan.log").appendText("${java.util.Date()} - $buildScanUri\n") + } } } diff --git a/versions.properties b/versions.properties index 26e7b3f0..1a664853 100644 --- a/versions.properties +++ b/versions.properties @@ -1,11 +1,13 @@ -## suppress inspection "SpellCheckingInspection" for whole file -## suppress inspection "UnusedProperty" for whole file -## -## Dependencies and Plugin versions with their available updates -## Generated by $ ./gradlew refreshVersions -## Please, don't put extra comments in that file yet, keeping them is not supported yet. +#### Dependencies and Plugin versions with their available updates. +#### Generated by `./gradlew refreshVersions` version 0.10.0 +#### +#### Don't manually edit or split the comments that start with four hashtags (####), +#### they will be overwritten by refreshVersions. +#### +#### suppress inspection "SpellCheckingInspection" for whole file +#### suppress inspection "UnusedProperty" for whole file -plugin.com.github.johnrengelman.shadow=7.0.0 +plugin.com.github.johnrengelman.shadow=6.1.0 plugin.com.vanniktech.dependency.graph.generator=0.5.0 @@ -15,11 +17,24 @@ plugin.org.jetbrains.kotlin.plugin.scripting=version.kotlin plugin.org.jetbrains.kotlin.plugin.serialization=version.kotlin -version.blue.endless..jankson=1.2.0 +version.blue.endless..jankson=1.2.1 + +version.ch.qos.logback..logback-classic=1.2.3 +## # available=1.3.0-alpha0 +## # available=1.3.0-alpha1 +## # available=1.3.0-alpha2 +## # available=1.3.0-alpha3 +## # available=1.3.0-alpha4 +## # available=1.3.0-alpha5 + +version.com.github.NikkyAi..json-schema-serialization=0.5.2 +## # available=0.6.7-SNAPSHOT version.com.github.ajalt.clikt..clikt=3.1.0 +## # available=3.2.0 version.com.soywiz.korlibs.korte..korte=2.0.8 +## # available=2.1.1 version.io.github.microutils..kotlin-logging=2.0.6 @@ -27,17 +42,26 @@ version.json-schema-serialization=16a71f0ac0 ## # available=0.5.2 ## # available=0.6.7-SNAPSHOT -version.kotlin=1.5.0 +version.kotlin=1.4.32 +## # available=1.5.0-M1 +## # available=1.5.0-M2 +## # available=1.5.0-RC +## # available=1.5.0 +## # available=1.5.10 version.kotlinpoet=1.8.0 version.kotlinx.coroutines=1.4.3 +## # available=1.5.0-native-mt ## # available=1.5.0-RC-native-mt ## # available=1.5.0-RC +## # available=1.5.0 version.kotlinx.html=0.7.3 -version.kotlinx.serialization=1.2.0 +version.kotlinx.serialization=1.1.0 +## # available=1.2.0 +## # available=1.2.1 version.ktor=1.5.4