Merge 66b280b into 47468c3

thewca · May 7, 2021 · 88309eb · 88309eb
2 parents 47468c3 + 66b280b
commit 88309eb
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 26 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,3 +30,4 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: 'tnoodle-ui/coverage/lcov.info'
+        base-path: 'tnoodle-ui'
diff --git 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
@@ -4,9 +4,9 @@ plugins {
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 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
@@ -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/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()
-    }
 }
diff --git 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<String> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,6 @@ plugins {
     kotlin("jvm")
     application
     SHADOW
-    GIT_VERSION_TAG
     KOTLIN_SERIALIZATION
 }
 
@@ -78,7 +77,7 @@ tasks.withType<KotlinCompile> {
 }
 
 application {
-    mainClassName = "org.worldcubeassociation.tnoodle.server.webscrambles.WebscramblesServer"
+    mainClass.set("org.worldcubeassociation.tnoodle.server.webscrambles.WebscramblesServer")
 }
 
 tasks.create<JavaExec>("i18nCheck") {