From c3066f549c38aeb1f187fd3f81c335faca4d08bf Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:50:07 +0200
Subject: new: small gui changes (#132)

* remove background from HUD and close buttons

* Gui improvements (#126)

* Fix drop shadow

* Add credit to the best team member in polyfrost :>

* Removed some unused buttons & improved line spacing

* new logo

* new arrows

* Added new animations & tweaked timings

* Update new page animation, and sidebar animations

* Update EaseOutBump.java

* apiDump

Co-authored-by: Wyvest <45589059+Wyvest@users.noreply.github.com>
Co-authored-by: CaledonianEH <62163840+CaledonianEH@users.noreply.github.com>
---
 versions/build.gradle.kts | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

(limited to 'versions')

diff --git a/versions/build.gradle.kts b/versions/build.gradle.kts
index da41fe0..cc9b34d 100644
--- a/versions/build.gradle.kts
+++ b/versions/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
     id("gg.essential.defaults.loom")
     id("com.github.johnrengelman.shadow")
     id("net.kyori.blossom") version "1.3.0"
-    id("org.jetbrains.dokka") version "1.6.21"
     id("maven-publish")
     id("signing")
     java
@@ -24,6 +23,7 @@ kotlin.jvmToolchain {
 
 java {
     withSourcesJar()
+    withJavadocJar()
 }
 
 val mod_name: String by project
@@ -166,8 +166,6 @@ dependencies {
 
     include("cc.polyfrost:lwjgl-$platform:1.0.0-alpha8")
 
-    dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21")
-
     configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME) { extendsFrom(shadeProject) }
     configurations.named(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) { extendsFrom(shadeProject) }
 }
@@ -227,7 +225,7 @@ tasks {
                 exclude("mcmod.info")
             }
         }
-        if (!name.contains("sourcesjar", ignoreCase = true) || !name.contains("dokka", ignoreCase = true)) {
+        if (!name.contains("sourcesjar", ignoreCase = true) || !name.contains("javadoc", ignoreCase = true)) {
             exclude("**/**_Test.**")
             exclude("**/**_Test$**.**")
         }
@@ -287,34 +285,8 @@ tasks {
         excludeInternal()
         archiveClassifier.set("")
     }
-    dokkaHtml.configure {
-        outputDirectory.set(buildDir.resolve("dokka"))
-        moduleName.set("OneConfig $platform")
-        moduleVersion.set(mod_major_version + mod_minor_version)
-        dokkaSourceSets {
-            configureEach {
-                jdkVersion.set(8)
-                //reportUndocumented.set(true)
-            }
-        }
-        doLast {
-            val outputFile = outputDirectory.get().resolve("images/logo-icon.svg")
-            if (outputFile.exists()) {
-                outputFile.delete()
-            }
-            val inputFile = project.rootDir.resolve("src/main/resources/assets/oneconfig/icons/OneConfig.svg")
-            inputFile.copyTo(outputFile)
-        }
-    }
-    val dokkaJar = create("dokkaJar", Jar::class.java) {
-        archiveClassifier.set("dokka")
-        group = "build"
-        dependsOn(dokkaHtml)
-        from(layout.buildDirectory.dir("dokka"))
-    }
     named<Jar>("sourcesJar") {
         from(project(":").sourceSets.main.map { it.allSource })
-        dependsOn(dokkaJar)
         excludeInternal()
         archiveClassifier.set("sources")
         doFirst {
@@ -327,6 +299,9 @@ tasks {
             archiveClassifier.set("sources")
         }
     }
+    named<Jar>("javadocJar") {
+        archiveClassifier.set("javadoc")
+    }
     withType<RemapSourcesJarTask> {
         enabled = false
     }
@@ -341,7 +316,7 @@ publishing {
             artifact(tasks["jar"])
             artifact(tasks["remapJar"])
             artifact(tasks["sourcesJar"])
-            artifact(tasks["dokkaJar"])
+            artifact(tasks["javadocJar"])
         }
     }
 
-- 
cgit