Skip to content

Commit

Permalink
Merge pull request #4 from samuele794/TakaoV1.1
Browse files Browse the repository at this point in the history
Takao v1.1 -> Takao v1.2
  • Loading branch information
samuele794 authored Apr 28, 2019
2 parents 5e186e7 + d6fca24 commit db63b89
Show file tree
Hide file tree
Showing 638 changed files with 50,539 additions and 6,636 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,5 @@ tokenDiscord.txt
gradle/wrapper/gradle-wrapper.jar
src/main/bin/logback.xml
src/main/bin/jsonboss.json
src/main/resources/twitter4j.properties
src/main/resources/hibernate.cfg.xml
62 changes: 60 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
mainClassName = 'starter.start'

group 'it.github.samuele794.discordbotTakao'
version '1.0.1'
version '1.2.0'
def jdaVersion = '3.8.2_459'


Expand All @@ -31,12 +31,70 @@ dependencies {
compile "org.apache.commons:commons-text:1.3"
// https://mvnrepository.com/artifact/org.quartz-scheduler/quartz
compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.0'

// https://mvnrepository.com/artifact/org.postgresql/postgresql
compile group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
// https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.25.2'
// compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.25.2'


//SISTEMA PER LOG
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'

// https://mvnrepository.com/artifact/com.sedmelluq/lavaplayer-natives
compile group: 'com.sedmelluq', name: 'lavaplayer-natives', version: '1.3.12'


// compile 'com.sedmelluq:lavaplayer:1.3.11' // https://mvnrepository.com/artifact/commons-validator/commons-validator
compile group: 'commons-validator', name: 'commons-validator', version: '1.6'

//JDA 3.8.2
// https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.14.0'


//DIPENDENZE PER MUSICBOT
// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.7'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8'
// https://mvnrepository.com/artifact/commons-io/commons-io
compile group: 'commons-io', name: 'commons-io', version: '2.6'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'

//TwitterAPI
// https://mvnrepository.com/artifact/org.twitter4j/twitter4j-core
compile group: 'org.twitter4j', name: 'twitter4j-core', version: '4.0.7'
// https://mvnrepository.com/artifact/org.twitter4j/twitter4j-stream
compile group: 'org.twitter4j', name: 'twitter4j-stream', version: '4.0.7'
// https://mvnrepository.com/artifact/org.twitter4j/twitter4j-async
compile group: 'org.twitter4j', name: 'twitter4j-async', version: '4.0.7'

compile "org.hibernate:hibernate-core:5.4.2.Final"


}

javadoc {
options.showAll()
options.setDestinationDirectory()
options.encoding('UTF-8')
options.setUse(true)
options.author(true)
options.version(true)
options.windowTitle("Documentazione TakaoBot")
options.docTitle("Documentazione TakaoBot")
exclude("com/sedmelluq/**")
}

if (JavaVersion.current().isJava8Compatible()) {
tasks.withType(Javadoc) {
// disable the crazy super-strict doclint tool in Java 8
//noinspection SpellCheckingInspection
options.addStringOption('Xdoclint:none', '-quiet')
}
}


Expand Down
9 changes: 9 additions & 0 deletions docs/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

]
}
63 changes: 0 additions & 63 deletions docs/LICENSE.txt

This file was deleted.

5 changes: 5 additions & 0 deletions docs/assets/resizer-3x2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions docs/assets/upload-drag-drop-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
142 changes: 0 additions & 142 deletions docs/comandi.html

This file was deleted.

8 changes: 8 additions & 0 deletions docs/css/bootstrap-italia.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/css/bootstrap-italia.min.css.map

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions docs/css/commandStyle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@media (min-width: 992px) {
.navbar.it-top-navscroll.affix-top {
top: 75px
}

.navbar.it-navscroll-wrapper .link-list-wrapper ul li a.active {
border-left: 0;
}
}

@media (max-width: 992px) {
.navbar.it-top-navscroll {
top: auto
}

.navbar.it-navscroll-wrapper .link-list-wrapper ul li a.active {
border-left: 0;
}

.it-page-section {
padding-top: 150px
}
}

.logoCommand {
height: 32px;
margin-left: 10px;
}

kbd {
font-size: 16px;
background-color: #83C4FA;
color: #000000;
}

p {
font-size: 16px;
}
4 changes: 0 additions & 4 deletions docs/css/font-awesome.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions docs/css/ie/backgroundsize.min.htc

This file was deleted.

8 changes: 0 additions & 8 deletions docs/css/ie/html5shiv.js

This file was deleted.

Loading

0 comments on commit db63b89

Please sign in to comment.