From 8e5c63d035ef44a269b8c43430f43f5c8eebfb63 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 10 Nov 2023 11:46:54 +0100 Subject: Restructure the project to utilize included builds (#3174) * Refactor and simplify artifact publishing * Update Gradle to 8.4 * Refactor and simplify convention plugins and build scripts Fixes #3132 --------- Co-authored-by: Adam <897017+aSemy@users.noreply.github.com> Co-authored-by: Oleg Yukhnevich --- .../javadoc/src/main/resources/views/class.korte | 329 --------------------- .../src/main/resources/views/components/base.korte | 19 -- .../resources/views/components/bottomNavbar.korte | 20 -- .../src/main/resources/views/components/head.korte | 18 -- .../resources/views/components/indexPage.korte | 30 -- .../resources/views/components/indexTable.korte | 18 -- .../main/resources/views/components/navList.korte | 27 -- .../main/resources/views/components/subNav.korte | 44 --- .../resources/views/components/topNavbar.korte | 24 -- .../src/main/resources/views/deprecated.korte | 40 --- .../src/main/resources/views/indexPage.korte | 32 -- .../src/main/resources/views/listPage.korte | 13 - .../javadoc/src/main/resources/views/tabPage.korte | 4 - .../src/main/resources/views/treePage.korte | 48 --- 14 files changed, 666 deletions(-) delete mode 100644 plugins/javadoc/src/main/resources/views/class.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/base.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/head.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/indexPage.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/indexTable.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/navList.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/subNav.korte delete mode 100644 plugins/javadoc/src/main/resources/views/components/topNavbar.korte delete mode 100644 plugins/javadoc/src/main/resources/views/deprecated.korte delete mode 100644 plugins/javadoc/src/main/resources/views/indexPage.korte delete mode 100644 plugins/javadoc/src/main/resources/views/listPage.korte delete mode 100644 plugins/javadoc/src/main/resources/views/tabPage.korte delete mode 100644 plugins/javadoc/src/main/resources/views/treePage.korte (limited to 'plugins/javadoc/src/main/resources/views') diff --git a/plugins/javadoc/src/main/resources/views/class.korte b/plugins/javadoc/src/main/resources/views/class.korte deleted file mode 100644 index 54106dda..00000000 --- a/plugins/javadoc/src/main/resources/views/class.korte +++ /dev/null @@ -1,329 +0,0 @@ -{% extends "components/base.korte" %} -{% block content %} - -
-
-
Package {{ packageName }}
-

{{ kind|capitalize }} {{ name }}

-
-
- -
-
    -
  • - {% if implementedInterfaces.size != 0 %} -
    -
    All Implemented Interfaces:
    -
    - {% for name in implementedInterfaces %} - {{ name }} - {% if !loop.last %} - , - {% endif %} - {% endfor %} -
    -
    - {% endif %} -
    - 
    -{% if signature.annotations != null %}{{ signature.annotations|raw }} {% endif %}
-{{ signature.modifiers }} {{ signature.signatureWithoutModifiers|raw }}
-{% if signature.supertypes != null %}{{signature.supertypes|raw}}{% endif %}
-
    -
    {{ classlikeDocumentation|raw }}
    - -
    - - {% if sinceTagContent.size() != 0 %} -
    Since:
    - {% for since in sinceTagContent %} -
    {{ since|raw }}
    - {% endfor %} - {% endif %} - - {% if authorTagContent.size() != 0 %} -
    Author:
    - {% for author in authorTagContent %} -
    {{ author|raw }}
    - {% endfor %} - {% endif %} - -
    -
    • -
-
-
-
    -
  • - - {% if classlikes.size != 0 %} -
    -
      -
    • - - -

      Nested Class Summary

      -
      - - - - - - - - {% for classlike in classlikes %} - - - - - - {% endfor %} -
      Nested Classes 
      Modifier and TypeClassDescription
      {{ classlike.modifiers }}{{ classlike.signature }} - {{ classlike.description|raw }}
      -
      -
      • -
    -
    - {% endif %} - - {% if properties.size != 0 %} -
    -
      -
    • - - -

      Field Summary

      -
      - - - - - - - - {% for property in properties %} - - - - - - {% endfor %} -
      Fields 
      Modifier and TypeFieldDescription
      {{ property.modifiers|raw }}{{ property.signature|raw }}{{ description|raw }}
      -
      -
      • -
    -
    - {% endif %} - - {% if constructors.size != 0 %} -
    -
      -
    • - - -

      Constructor Summary

      -
      - - - - - - - - - {% for constructor in constructors %} - - - - - {% endfor %} - - -
      Constructors 
      ConstructorDescription
      {{ constructor.name }}({{ constructor.inlineParameters|raw }}){{ constructor.brief|raw }}
      -
      -
      • -
    -
    - {% endif %} - - {% if entries.size != 0 %} -
    - -
    - {% endif %} - - {% if methods.own.size !=0 || methods.inherited.size != 0 %} -
    -
      -
    • - - -

      Method Summary

      -
      -
      - - -
      -
      - - - - - - - {% for method in methods.own %} - - - - - - {% endfor %} - -
      Modifier and TypeMethodDescription
      {{ method.signature.modifiers|raw }} - {{ method.signature.signatureWithoutModifiers|raw }} - {{ method.brief|raw }}
      -
      -
        - {% for method in methods.inherited %} -
      • - - -

        Methods inherited from class {{ method.inheritedFrom}}

        - {{ method.names }}
        • - {% endfor %} -
      • - - -

        Methods inherited from class java.lang.Object

        - clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, - wait, wait, wait
        • -
      -
      • -
    -
    - {% endif %} -
    • -
-
-
-
    -
  • - - {% if constructors.size != 0 %} -
    -
      -
    • - - -

      Constructor Detail

      - {% for constructor in constructors %} - -
        -
      • -

        {{ constructor.name }}

        - 
        {{ constructor.name }}({{ constructor.inlineParameters|raw }})
        -
        {{ constructor.brief|raw}}
        - {% if constructor.parameters.size != 0 && hasAnyDescription(constructor.parameters) %} -
        -
        Parameters:
        - {% for parameter in constructor.parameters %} - {% if parameter.description != "" %} -
        {{ parameter.name }} - {{ parameter.description|raw }}
        - {% endif %} - {% endfor %} -
        - {% endif %} -
        • -
      - {% endfor %} -
      • -
    -
    - {% endif %} - - {% if methods.own.size != 0 %} -
    -
      -
    • - - -

      Method Detail

      - {% for method in methods.own %} - - - -
        -
      • -

        {{ method.name }}

        - 
        {{ method.signature.annotations|raw }} {{ method.signature.modifiers|raw }} {{ method.signature.signatureWithoutModifiers|raw}}
        -
        {{ method.description|raw }}
        - -
        - - {% if method.parameters.size != 0 && hasAnyDescription(method.parameters) %} -
        Parameters:
        - {% for parameter in method.parameters %} - {% if parameter.description != "" %} -
        {{ parameter.name }} - {{ parameter.description|raw }}
        - {% endif %} - {% endfor %} - {% endif %} - - {% if method.returnTagContent != "" %} -
        Returns:
        -
        {{ method.returnTagContent|raw }}
        - {% endif %} - - {% if method.sinceTagContent.size() != 0 %} -
        Since:
        - {% for since in method.sinceTagContent %} -
        {{ since|raw }}
        - {% endfor %} - {% endif %} - -
        -
        • -
      - {% endfor %} -
      • -
    -
    - {% endif %} -
    • -
-
-
-
-{% end %} \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/base.korte b/plugins/javadoc/src/main/resources/views/components/base.korte deleted file mode 100644 index 6e2f6c4c..00000000 --- a/plugins/javadoc/src/main/resources/views/components/base.korte +++ /dev/null @@ -1,19 +0,0 @@ - - - -{%- include "components/head.korte" -%} - - - -{%- include "components/topNavbar.korte" -%} -{%- block content %} {% endblock -%} -{%- include "components/bottomNavbar.korte" -%} - - - - \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte b/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte deleted file mode 100644 index a9d83e5c..00000000 --- a/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/head.korte b/plugins/javadoc/src/main/resources/views/components/head.korte deleted file mode 100644 index 8f4aa12d..00000000 --- a/plugins/javadoc/src/main/resources/views/components/head.korte +++ /dev/null @@ -1,18 +0,0 @@ - - {{ title }} {% if version != null %}{{ version }} API {% endif %} - - - - - - - - - - - - - - - - diff --git a/plugins/javadoc/src/main/resources/views/components/indexPage.korte b/plugins/javadoc/src/main/resources/views/components/indexPage.korte deleted file mode 100644 index 84679fad..00000000 --- a/plugins/javadoc/src/main/resources/views/components/indexPage.korte +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

{{ title }} {% if version != null %}{{ version }} API {% endif %}

-
-
-
-
{{ subtitle|raw }}
-
-

See: Description

-
-
- {% if lists %} -
    - {% for item in lists%} -
  • - {% set list = item.list %} - {% set colTitle = item.colTitle %} - {% set tabTitle = item.tabTitle %} - {% set isTypeSummary = "true" %} - {% include "components/indexTable.korte" %} -
    • - {% endfor %} -
- {% else %} -
- {% include "components/indexTable.korte" %} -
- {% endif %} -
-
\ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/indexTable.korte b/plugins/javadoc/src/main/resources/views/components/indexTable.korte deleted file mode 100644 index 21c94b7c..00000000 --- a/plugins/javadoc/src/main/resources/views/components/indexTable.korte +++ /dev/null @@ -1,18 +0,0 @@ -{% if isTypeSummary %} -
-{% endif %} - - - - - - - -{% for item in list %} - {{ createTabRow(item, contextRoot)|raw }} -{% end -%} - -
{{ tabTitle }} 
{{ colTitle }}Description
-{% if isTypeSummary %} -
-{% endif %} \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/navList.korte b/plugins/javadoc/src/main/resources/views/components/navList.korte deleted file mode 100644 index dbfe7eb3..00000000 --- a/plugins/javadoc/src/main/resources/views/components/navList.korte +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/subNav.korte b/plugins/javadoc/src/main/resources/views/components/subNav.korte deleted file mode 100644 index 7869d747..00000000 --- a/plugins/javadoc/src/main/resources/views/components/subNav.korte +++ /dev/null @@ -1,44 +0,0 @@ -
-{% if kind == "indexPage" %} -
    - {%- if prevLetter != "" %} -
  • PREV LETTER
    • - {% else %} -
  • PREV LETTER
    • - {% endif -%} - {%- if nextLetter != "" %} -
  • NEXT LETTER
    • - {% else %} -
  • NEXT LETTER
    • - {% endif -%} -
-{% end -%} - -{% if type != "bottom" %} -
    -
  • - - -
    • -
-{% end -%} -
- - -
- - -
\ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/components/topNavbar.korte b/plugins/javadoc/src/main/resources/views/components/topNavbar.korte deleted file mode 100644 index 59b84558..00000000 --- a/plugins/javadoc/src/main/resources/views/components/topNavbar.korte +++ /dev/null @@ -1,24 +0,0 @@ -
- -
\ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/deprecated.korte b/plugins/javadoc/src/main/resources/views/deprecated.korte deleted file mode 100644 index a22e1069..00000000 --- a/plugins/javadoc/src/main/resources/views/deprecated.korte +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "components/base.korte" %} -{% block content %} - -
-
-

Deprecated API

-

Contents

- -
-
- {% for section in sections %} - -
    -
  • -
    - - - - - - - {% for element in section.elements %} - - - - - {% endfor %} -
    {{ section.caption }} 
    {{ section.header }}Description
    - {{ element.name }} - {{ element.description|raw }}
    -
    -
    • -
- {% endfor %} -
-
\ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/indexPage.korte b/plugins/javadoc/src/main/resources/views/indexPage.korte deleted file mode 100644 index 2881e86d..00000000 --- a/plugins/javadoc/src/main/resources/views/indexPage.korte +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "components/base.korte" %} -{% block content %} - -
-
- {% for key in dictionary %} - {{ key }}  - {% endfor %} -

{{ dictionary[id - 1] }}

-
- {% for key in elements %} -
- {% if key.isMember %} - - {% endif %} - {{ key.name }} - {% if key.isMember %} - - {{ key.type }} in {{ key.origin|raw }} - {% else %} - - {{ key.type }} {{ key.name }} - {% endif %} - -
-
{{ key.description|raw }}
- - {% endfor %} -
- {% for key in dictionary %} - {{ key }}  - {% endfor %} -
-
\ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/listPage.korte b/plugins/javadoc/src/main/resources/views/listPage.korte deleted file mode 100644 index 985f1d4d..00000000 --- a/plugins/javadoc/src/main/resources/views/listPage.korte +++ /dev/null @@ -1,13 +0,0 @@ - -{% include "components/head.korte" -%} - -

{{ title }}

-
-
    - {% for item in list %} -
  • {{ createListRow(item, contextRoot)|raw }}
    • - {% end -%} -
-
- - \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/tabPage.korte b/plugins/javadoc/src/main/resources/views/tabPage.korte deleted file mode 100644 index c69d2c97..00000000 --- a/plugins/javadoc/src/main/resources/views/tabPage.korte +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "components/base.korte" %} -{% block content %} -{% include "components/indexPage.korte" %} -{% end %} diff --git a/plugins/javadoc/src/main/resources/views/treePage.korte b/plugins/javadoc/src/main/resources/views/treePage.korte deleted file mode 100644 index 73a23896..00000000 --- a/plugins/javadoc/src/main/resources/views/treePage.korte +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "components/base.korte" %} -{% block content %} -
-
- {% if kind == "main" %} -

Hierarchy For All Packages

- {% else %} -

Hierarchy For Package {{ title }}

- {% end -%} - Package Hierarchies: -
    - {% if kind == "main" %} - {{ createPackageHierarchy(list)|raw }} - {% else %} -
  • All Packages
    • - {% end -%} -
-
-
-
-

Class Hierarchy

-
    - {{ renderInheritanceGraph(classGraph)|raw }} -
-
-
-

Interface Hierarchy

-
    - {{ renderInheritanceGraph(interfaceGraph)|raw }} -
-
-
-

Enum Hierarchy

-
    -
  • java.lang.Object -
      -
    • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) - -
      • -
    -
    • -
-
-
-
-{% end %} -- cgit