diff options
| -rw-r--r-- | build.gradle | 17 | ||||
| -rw-r--r-- | javadoc/build.gradle | 7 | ||||
| -rw-r--r-- | settings.gradle | 1 | ||||
| -rw-r--r-- | src/javadoc/java/io/github/cottonmc/cotton/gui/jd/ExperimentalTaglet.java (renamed from javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/ExperimentalTaglet.java) | 0 | ||||
| -rw-r--r-- | src/javadoc/java/io/github/cottonmc/cotton/gui/jd/PropertyTaglet.java (renamed from javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/PropertyTaglet.java) | 0 | ||||
| -rw-r--r-- | src/javadoc/java/io/github/cottonmc/cotton/gui/jd/Util.java (renamed from javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/Util.java) | 0 |
6 files changed, 10 insertions, 15 deletions
diff --git a/build.gradle b/build.gradle index 38d2974..3ebd1fe 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,9 @@ archivesBaseName = project.archives_base_name version = "$project.mod_version+$project.minecraft_version" group = project.maven_group -configurations { - javadocClasspath +sourceSets { + javadoc { + } } repositories { @@ -62,8 +63,6 @@ dependencies { modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { exclude group: 'net.fabricmc.fabric-api' } - - javadocClasspath project(':javadoc') } processResources { @@ -117,17 +116,21 @@ allprojects { } } -evaluationDependsOn(':javadoc') +def javadocBuildJar = tasks.register('javadocBuildJar', Jar) { + destinationDirectory = file('build/devlibs') + archiveClassifier = 'javadoc-build' + from sourceSets.javadoc.output +} javadoc { - dependsOn project(':javadoc').tasks.jar + dependsOn javadocBuildJar options { links "https://maven.fabricmc.net/docs/yarn-$project.yarn_mappings" links 'https://javadoc.io/doc/org.jetbrains/annotations/19.0.0' taglets 'io.github.cottonmc.cotton.gui.jd.ExperimentalTaglet', 'io.github.cottonmc.cotton.gui.jd.PropertyTaglet' - tagletPath project(':javadoc').tasks.jar.outputs.files.singleFile + tagletPath javadocBuildJar.get().archiveFile.get().asFile } exclude("**/impl/**") diff --git a/javadoc/build.gradle b/javadoc/build.gradle deleted file mode 100644 index d263b57..0000000 --- a/javadoc/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id 'java' -} - -repositories { - mavenCentral() -} diff --git a/settings.gradle b/settings.gradle index d6015c6..ecd1298 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,4 +11,3 @@ pluginManagement { rootProject.name = 'LibGui' include ':GuiTest' -include 'javadoc' diff --git a/javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/ExperimentalTaglet.java b/src/javadoc/java/io/github/cottonmc/cotton/gui/jd/ExperimentalTaglet.java index dbd2391..dbd2391 100644 --- a/javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/ExperimentalTaglet.java +++ b/src/javadoc/java/io/github/cottonmc/cotton/gui/jd/ExperimentalTaglet.java diff --git a/javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/PropertyTaglet.java b/src/javadoc/java/io/github/cottonmc/cotton/gui/jd/PropertyTaglet.java index 8b7b1ec..8b7b1ec 100644 --- a/javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/PropertyTaglet.java +++ b/src/javadoc/java/io/github/cottonmc/cotton/gui/jd/PropertyTaglet.java diff --git a/javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/Util.java b/src/javadoc/java/io/github/cottonmc/cotton/gui/jd/Util.java index 775de4d..775de4d 100644 --- a/javadoc/src/main/java/io/github/cottonmc/cotton/gui/jd/Util.java +++ b/src/javadoc/java/io/github/cottonmc/cotton/gui/jd/Util.java |