Update versions, very minor buildscript cleanup

- Update versions of everything to the latest - Clean up some minor buildscript stuff Signed-off-by: solonovamax <[email protected]>
solo-studios · Oct 19, 2023 · b3ae4f9 · b3ae4f9
1 parent 159d345
commit b3ae4f9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/buildSrc/src/main/kotlin/kt-fuzzy.compilation.gradle.kts b/buildSrc/src/main/kotlin/kt-fuzzy.compilation.gradle.kts
@@ -56,7 +56,7 @@ kotlin {
     }
 
     // Why is kotlin/js broken? I don't fucking know!
-    // For some reason it shows errors when importing a library I definitely added as a dependency!
+    // For some reason it refuses to run my tests!
     js(IR) {
         configureCommonJs()
         configureEsModules()

diff --git a/buildSrc/src/main/kotlin/kt-fuzzy.dokka.gradle.kts b/buildSrc/src/main/kotlin/kt-fuzzy.dokka.gradle.kts
@@ -30,6 +30,7 @@ import ca.solostudios.dokkascript.plugin.DokkaScriptsConfiguration
 import ca.solostudios.dokkascript.plugin.DokkaScriptsPlugin
 import ca.solostudios.dokkastyles.plugin.DokkaStyleTweaksConfiguration
 import ca.solostudios.dokkastyles.plugin.DokkaStyleTweaksPlugin
+import com.sass_lang.embedded_protocol.OutputStyle
 import io.freefair.gradle.plugins.sass.SassCompile
 import java.time.Year
 import org.apache.tools.ant.filters.ReplaceTokens
@@ -41,7 +42,6 @@ import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
-import sass.embedded_protocol.EmbeddedSass.OutputStyle
 
 plugins {
     id("org.jetbrains.dokka")
@@ -110,14 +110,14 @@ tasks {
             expand("project" to projectInfo)
         }
 
-        destinationDir = buildDir.resolve("dokka").resolve("includes")
+        destinationDir = layout.buildDirectory.dir("dokka/includes").get().asFile
         group = JavaBasePlugin.DOCUMENTATION_GROUP
     }
 
     val compileDokkaSass by register<SassCompile>("compileDokkaSass") {
         group = BasePlugin.BUILD_GROUP
         source = fileTree(rootDokkaDirectory.resolve("styles"))
-        destinationDir = buildDir.resolve("dokka/styles")
+        destinationDir = layout.buildDirectory.dir("dokka/styles")
     }
 
     withType<AbstractDokkaTask>().configureEach {
@@ -134,7 +134,7 @@ tasks {
             val compiledStyles = rootDokkaDirectory.resolve("styles").listFiles { file ->
                 file.extension == "scss" && !file.name.startsWith("_")
             }?.map {
-                buildDir.resolve("dokka/styles").resolve("${it.nameWithoutExtension}.css")
+                layout.buildDirectory.file("dokka/styles/${it.nameWithoutExtension}.css").get().asFile
             }.orEmpty()
 
             customStyleSheets = rootStyles + compiledStyles

diff --git a/buildSrc/src/main/kotlin/kt-fuzzy.versioning.gradle.kts b/buildSrc/src/main/kotlin/kt-fuzzy.versioning.gradle.kts
@@ -27,14 +27,11 @@
  */
 
 plugins {
-    // alias(libs.plugins.axion.release)
     id("pl.allegro.tech.build.axion-release")
 }
 
 scmVersion {
     tag {
-        // println("prefix = ${project.name.toStringOrEmpty().replace("-", "")}")
-        // prefix.set(project.name.toStringOrEmpty().replace("-", ""))
         prefix = project.name
         versionSeparator = "-"
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlin = "1.9.0"
-dokka = "1.9.0"
-axion-release = "1.15.4"
-kotest = "5.6.2"
+kotlin = "1.9.10"
+dokka = "1.9.10"
+axion-release = "1.15.5"
+kotest = "5.7.2"
 kotlinx-benchmark = "0.4.9"
-freefair-sass = "8.3"
+freefair-sass = "8.4"
 
 [plugins]
 ## Kotlin Plugins

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -28,8 +28,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists