From 61d1b276bb6f3fd090d235224bc2319c0f9d89d0 Mon Sep 17 00:00:00 2001 From: Gregor Billing Date: Wed, 28 Apr 2021 11:16:05 +0200 Subject: [PATCH 1/2] Migrate to Gradle 7 --- buildSrc/build.gradle.kts | 1 + buildSrc/src/main/kotlin/PluginsHack.kt | 4 ---- .../kotlin/configurations/ProjectVersions.kt | 16 +++++++++++----- buildSrc/src/main/kotlin/dependencies/Plugins.kt | 3 --- .../src/main/kotlin/dependencies/Versions.kt | 3 +-- cloudscrambles/build.gradle.kts | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- webscrambles/build.gradle.kts | 3 +-- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5b04aafb1..dbfb72392 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -9,4 +9,5 @@ repositories { dependencies { implementation("org.bouncycastle:bcprov-jdk15on:1.68") + implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r") } diff --git a/buildSrc/src/main/kotlin/PluginsHack.kt b/buildSrc/src/main/kotlin/PluginsHack.kt index 49992511c..f00946821 100644 --- a/buildSrc/src/main/kotlin/PluginsHack.kt +++ b/buildSrc/src/main/kotlin/PluginsHack.kt @@ -3,7 +3,6 @@ import dependencies.Libraries.Buildscript.PROGUARD_GRADLE_ACTUAL import dependencies.Libraries.Buildscript.WCA_I18N_ACTUAL import dependencies.Libraries.Buildscript.KOTLINX_ATOMICFU_GRADLE_ACTUAL import dependencies.Plugins.DEPENDENCY_VERSIONS_ACTUAL -import dependencies.Plugins.GIT_VERSION_TAG_ACTUAL import dependencies.Plugins.GOOGLE_APPENGINE_ACTUAL import dependencies.Plugins.KOTLESS_ACTUAL import dependencies.Plugins.KOTLIN_JVM_ACTUAL @@ -43,9 +42,6 @@ inline val PluginDependenciesSpec.GOOGLE_APPENGINE: PluginDependencySpec inline val PluginDependenciesSpec.DEPENDENCY_VERSIONS: PluginDependencySpec get() = DEPENDENCY_VERSIONS_ACTUAL -inline val PluginDependenciesSpec.GIT_VERSION_TAG: PluginDependencySpec - get() = GIT_VERSION_TAG_ACTUAL - inline val PluginDependenciesSpec.KOTLESS: PluginDependencySpec get() = KOTLESS_ACTUAL diff --git a/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt b/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt index 35785bd27..07f4e22b9 100644 --- a/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt +++ b/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt @@ -3,9 +3,9 @@ package configurations import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.plugins.ExtraPropertiesExtension -import org.gradle.kotlin.dsl.extra -import org.gradle.kotlin.dsl.invoke -import org.gradle.kotlin.dsl.provideDelegate +import org.eclipse.jgit.api.Git +import org.eclipse.jgit.lib.RepositoryBuilder +import java.io.File object ProjectVersions { const val TNOODLE_IMPL_KEY = "TNOODLE_IMPL" @@ -16,8 +16,14 @@ object ProjectVersions { const val TNOODLE_SYMLINK = "TNoodle-Build-latest.jar" fun Project.gitVersionTag(): String { - val gitVersion: groovy.lang.Closure by extra - return gitVersion() + val repo = RepositoryBuilder() + .setGitDir(File(rootDir, "/.git")) + .readEnvironment() + .build() + + val version = repo.findRef("HEAD").objectId.name + val isClean = Git.wrap(repo).status().call().isClean + return version + (if (isClean) "" else ".dirty") } fun Task.setTNoodleRelease(ext: ExtraPropertiesExtension, name: String, version: String? = null) { diff --git a/buildSrc/src/main/kotlin/dependencies/Plugins.kt b/buildSrc/src/main/kotlin/dependencies/Plugins.kt index 6e18d5a07..0a312ca46 100644 --- a/buildSrc/src/main/kotlin/dependencies/Plugins.kt +++ b/buildSrc/src/main/kotlin/dependencies/Plugins.kt @@ -23,9 +23,6 @@ object Plugins { inline val PluginDependenciesSpec.DEPENDENCY_VERSIONS_ACTUAL: PluginDependencySpec get() = id("com.github.ben-manes.versions").version(Versions.Plugins.DEPENDENCY_VERSIONS) - inline val PluginDependenciesSpec.GIT_VERSION_TAG_ACTUAL: PluginDependencySpec - get() = id("com.palantir.git-version").version(Versions.Plugins.GIT_VERSION_TAG) - inline val PluginDependenciesSpec.KOTLESS_ACTUAL: PluginDependencySpec get() = id("io.kotless").version(Versions.Plugins.KOTLESS) diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt index 2557e231f..bd3b0e730 100644 --- a/buildSrc/src/main/kotlin/dependencies/Versions.kt +++ b/buildSrc/src/main/kotlin/dependencies/Versions.kt @@ -38,10 +38,9 @@ object Versions { val KOTLINX_ATOMICFU_GRADLE = "0.15.2" object Plugins { - val SHADOW = "6.1.0" + val SHADOW = "7.0.0" val NODEJS = "3.0.1" val DEPENDENCY_VERSIONS = "0.38.0" - val GIT_VERSION_TAG = "0.12.3" val KOTLIN = Versions.KOTLIN diff --git a/cloudscrambles/build.gradle.kts b/cloudscrambles/build.gradle.kts index 37608e213..07816ead0 100644 --- a/cloudscrambles/build.gradle.kts +++ b/cloudscrambles/build.gradle.kts @@ -16,7 +16,6 @@ attachRemoteRepositories() plugins { kotlin("jvm") war - GIT_VERSION_TAG KOTLIN_SERIALIZATION GOOGLE_APPENGINE //KOTLESS diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9c6c01be3..894695fb9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip diff --git a/webscrambles/build.gradle.kts b/webscrambles/build.gradle.kts index d29fafd75..032d711ee 100644 --- a/webscrambles/build.gradle.kts +++ b/webscrambles/build.gradle.kts @@ -40,7 +40,6 @@ plugins { kotlin("jvm") application SHADOW - GIT_VERSION_TAG KOTLIN_SERIALIZATION } @@ -78,7 +77,7 @@ tasks.withType { } application { - mainClassName = "org.worldcubeassociation.tnoodle.server.webscrambles.WebscramblesServer" + mainClass.set("org.worldcubeassociation.tnoodle.server.webscrambles.WebscramblesServer") } tasks.create("i18nCheck") { From 7825dcf016f98a9766bf652479e388cdbbc91397 Mon Sep 17 00:00:00 2001 From: Gregor Billing Date: Wed, 28 Apr 2021 11:30:57 +0200 Subject: [PATCH 2/2] Sunset JCenter --- build.gradle.kts | 1 - buildSrc/build.gradle.kts | 1 - buildSrc/src/main/kotlin/configurations/Languages.kt | 6 ------ 3 files changed, 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e80b64c54..4190992ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,6 @@ import proguard.gradle.ProGuardTask buildscript { repositories { mavenCentral() - jcenter() } dependencies { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index dbfb72392..8d603dd9d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,7 +4,6 @@ plugins { repositories { mavenCentral() - jcenter() } dependencies { diff --git a/buildSrc/src/main/kotlin/configurations/Languages.kt b/buildSrc/src/main/kotlin/configurations/Languages.kt index 22207c26f..1e00f1455 100644 --- a/buildSrc/src/main/kotlin/configurations/Languages.kt +++ b/buildSrc/src/main/kotlin/configurations/Languages.kt @@ -14,12 +14,6 @@ object Languages { fun Project.attachRemoteRepositories() { repositories { mavenCentral() - jcenter() } } - - fun Project.attachRepositories() { - attachLocalRepositories() - attachRemoteRepositories() - } }