Skip to content

Commit e35c2c6

Browse files
committed
More changes and first attempts at using Orchid
1 parent 77f53fd commit e35c2c6

File tree

124 files changed

+251
-60427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+251
-60427
lines changed

build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins{
77
id 'maven'
88
id 'com.github.johnrengelman.shadow' version '5.2.0'
99
id 'net.kyori.blossom' version '1.1.0'
10+
id "com.eden.orchidPlugin" version "0.21.0"
1011
}
1112

1213
def ver = new Version(major: 5, minor: 2, revision: 3)
@@ -16,6 +17,7 @@ allprojects {
1617
apply plugin: 'maven-publish'
1718
apply plugin: 'java-library'
1819
apply plugin: 'com.github.johnrengelman.shadow'
20+
apply plugin: 'com.eden.orchidPlugin'
1921

2022
group = "org.botblock"
2123
version = "$ver"
@@ -26,10 +28,18 @@ allprojects {
2628
}
2729

2830
dependencies {
29-
api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.7.2'
3031
api group: 'org.json', name: 'json', version: '20200518'
3132
api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.8.0'
3233
api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
34+
35+
orchidCompile("io.github.javaeden.orchid:OrchidCore:0.21.0")
36+
orchidCompile("io.github.javaeden.orchid:OrchidBsDoc:0.21.0")
37+
orchidRuntime("io.github.javaeden.orchid:OrchidJavadoc:0.21.0")
38+
}
39+
40+
orchid{
41+
baseUrl = "https://localhost:8080"
42+
version = "$ver"
3343
}
3444
}
3545

core/src/main/java/org/botblock/javabotblockapi/core/Site.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,6 @@ public enum Site {
123123
*/
124124
SPACE_BOT_LIST_ORG("space-bot-list.org"),
125125

126-
/**
127-
* <a href="https://vultrex.io" target="_blank">vultrex.io</a>
128-
*
129-
* @since 5.2.1
130-
*
131-
* @deprecated Renamed to {@link #DISCORDBOTS_CO DISCORDBOTS_CO}
132-
* <br>Planned removal in v5.2.5
133-
*/
134-
@Deprecated
135-
@DeprecatedSince(version = "5.2.3", replacements = {"#DISCORDBOTS_CO"})
136-
@PlannedRemoval(version = "5.2.5")
137-
VULTREX_IO("vultrex.io"),
138-
139126
/**
140127
* <a href="https://wonderbotlist.com" target="_blank">wonderbotlist.com</a>
141128
*/
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
* Copyright 2019 - 2020 Andre601
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
5+
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation
6+
* the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
7+
* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
8+
*
9+
* The above copyright notice and this permission notice shall be included in all copies or substantial
10+
* portions of the Software.
11+
*
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
13+
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
14+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
15+
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
16+
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
*/
18+
19+
/**
20+
* This is the core module used across all other modules.
21+
* <br>When using either of the other modules is this one here required to be installed too.
22+
*
23+
* <h1>Installation</h1>
24+
* When installing it, make sure to replace {@code {version}} from the examples below with the latest release.
25+
*
26+
* <h2>Maven</h2>
27+
* <pre><code>
28+
* <repositories>
29+
* <repository>
30+
* <id>jcenter</id>
31+
* <name>jcenter-bintray</name>
32+
* <url>https://jcenter.binrtray.com</url>
33+
* </repository>
34+
* </repositories>
35+
*
36+
* <dependencies>
37+
* <dependency>
38+
* <groupId>org.botblock</groupId>
39+
* <artifactId>JavaBotBlockAPI-core</artifactId>
40+
* <version>{version}</version>
41+
* </dependency>
42+
* </dependencies>
43+
* </code></pre>
44+
*
45+
* <h2>Gradle (Recommendet)</h2>
46+
* <pre><code>
47+
* repositories{
48+
* jcenter()
49+
* }
50+
*
51+
* dependencies{
52+
* compile 'org.botblock:JavaBotBlockAPI-core:{version}'
53+
* }
54+
* </code></pre>
55+
*
56+
* <h2>Manual</h2>
57+
* We do not recommend using jar files directly and instead use one of the above dependency management systems.
58+
* <br>If you still want to do it manually, or can't use one of the other option, head over to the
59+
* <a target="_blank" href="https://github.com/botblock/JavaBotBlockAPI/releases/latest">GitHub releases page</a> or to
60+
* the <a target="_blank" href="https://bintray.com/beta/#/andre601/maven/JavaBotBlockAPI?tab=overview">Bintray release page</a>
61+
* and download the jar files from there.
62+
*
63+
* <p>Note that you will not receive any support when using this method.
64+
*/
65+
package org.botblock.javabotblockapi.core;

0 commit comments

Comments
 (0)