Skip to content

Dev mysql #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
topi314 merged 3 commits into from
Mar 14, 2020
Merged

Dev mysql #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e554096
WIP: added mysql connection
Mar 14, 2020
c615b38
Merge branch 'dev-mysql' of D:\intellij-workspace\KittyBot with confl…
topi314 Mar 14, 2020
ab24448
rewrote database stuff to use a mysql database & removed poll feature
topi314 Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
build/
.gradle/
.idea/
logs/
.history
options.cfg

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
build/
.gradle/
.idea/
logs/
.history
options.cfg
# local env files
.env.local
.env.*.local
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<img src="src/main/resources/public/images/kittybot_banner_noborders.png" />

[![total downloads](https://img.shields.io/github/downloads/TopiSenpai/kittybot/total.svg)](https://github.com/TopiSenpai/kittybot/releases)

#### A Discord Bot to manage your roles
---

//TODO: README.md
<img src="src/main/resources/public/images/kittybot_banner_noborders.png" />
[![total downloads](https://img.shields.io/github/downloads/TopiSenpai/kittybot/total.svg)](https://github.com/TopiSenpai/kittybot/releases)
#### A Discord Bot to manage your roles
---
//TODO: README.md
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group 'de.anteiku'
version '2.5'
version '2.6'

mainClassName = 'de.anteiku.kittybot.KittyBot'
compileJava.options.encoding = 'UTF-8'
Expand All @@ -31,5 +31,7 @@ dependencies {
compile 'com.sparkjava:spark-core:2.9.1'

compile 'org.apache.velocity:velocity-engine-core:2.1'

compile 'mysql:mysql-connector-java:8.0.19'
}

12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Mar 11 14:26:41 CET 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
#Wed Mar 11 14:26:41 CET 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading