diff --git a/.gitignore b/.gitignore index 0464509..f21df9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,9 @@ -# Ignores Maven # -################# -/target/ -dependency-reduced-pom.xml - -# Others # -########## *.jar *.class -nb-configuration.xml -.idea/ *.iml +*.DS_Store +.idea/ +.gradle/ +target/ +build/ +run/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..67dfe47 --- /dev/null +++ b/build.gradle @@ -0,0 +1,54 @@ +plugins { + id 'java' + id 'maven-publish' + id "io.freefair.lombok" version "5.0.0" +} + +group = 'com.cadiducho' +version = '4.7' +sourceCompatibility = '1.8' + +java { + withJavadocJar() +} + +publishing { + publications { + maven(MavenPublication) { + groupId = project.group + artifactId = rootProject.name + version = project.version + + from components.java + } + } +} + +repositories { + mavenCentral() + mavenLocal() + maven { + url "https://cadiducho.com/repo/" + } +} + +dependencies { + implementation group: 'com.squareup.moshi', name: 'moshi', version: '1.8.0' + implementation group: 'com.squareup.okio', name: 'okio', version:'2.3.0' + implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.2.0' + + //Tests + testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.2.0' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.1' +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc) { + options.encoding = 'UTF-8' + options.addStringOption('Xdoclint:none', '-quiet') +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..490fda8 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..aee7674 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Apr 18 14:44:14 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000..6aa51d7 --- /dev/null +++ b/lombok.config @@ -0,0 +1,2 @@ +# This file is generated by the 'io.freefair.lombok' Gradle plugin +config.stopBubbling = true diff --git a/pom.xml b/pom.xml deleted file mode 100644 index b59d0fc..0000000 --- a/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - com.cadiducho - TelegramBotAPI - 4.7 - jar - - UTF-8 - 1.8 - 1.8 - - - - MIT License - https://github.com/Cadiducho/Telegram-Bot-API/blob/master/LICENSE - repo - - - - - java8-doclint-disabled - - [1.8,) - - - -Xdoclint:none - - - - jdk-11-config - - 11 - - - ${java.home}/bin/javadoc - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-surefire-plugin - 3.0.0-M3 - - - - - - - - - org.projectlombok - lombok - 1.18.10 - provided - - - - - com.squareup.moshi - moshi - 1.8.0 - - - com.squareup.okio - okio - 2.3.0 - - - com.squareup.okhttp3 - okhttp - 4.2.0 - - - com.squareup.okhttp3 - mockwebserver - 4.2.0 - test - - - - - org.junit.jupiter - junit-jupiter-api - 5.5.2 - test - - - org.junit.jupiter - junit-jupiter-params - 5.5.2 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.5.2 - test - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ec52a7d --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'TelegramBotAPI' diff --git a/src/main/java/com/cadiducho/telegrambotapi/Sticker.java b/src/main/java/com/cadiducho/telegrambotapi/Sticker.java index b388547..27f582a 100644 --- a/src/main/java/com/cadiducho/telegrambotapi/Sticker.java +++ b/src/main/java/com/cadiducho/telegrambotapi/Sticker.java @@ -41,7 +41,7 @@ public class Sticker { /** * True, if the sticker is animated. - * See {@link https://telegram.org/blog/animated-stickers} + * See https://telegram.org/blog/animated-stickers */ @Json(name = "is_animated") private Boolean isAnimated; diff --git a/src/main/java/com/cadiducho/telegrambotapi/StickerSet.java b/src/main/java/com/cadiducho/telegrambotapi/StickerSet.java index cbdafc8..ee3cc41 100644 --- a/src/main/java/com/cadiducho/telegrambotapi/StickerSet.java +++ b/src/main/java/com/cadiducho/telegrambotapi/StickerSet.java @@ -33,7 +33,7 @@ public class StickerSet { /** * True, if the sticker set contains animated stickers - * See {@link https://telegram.org/blog/animated-stickers} + * See https://telegram.org/blog/animated-stickers */ @Json(name = "is_animated") private Boolean isAnimated; diff --git a/src/main/java/com/cadiducho/telegrambotapi/TelegramBot.java b/src/main/java/com/cadiducho/telegrambotapi/TelegramBot.java index 1028dae..d931f2a 100644 --- a/src/main/java/com/cadiducho/telegrambotapi/TelegramBot.java +++ b/src/main/java/com/cadiducho/telegrambotapi/TelegramBot.java @@ -4,7 +4,6 @@ * Copyright 2020 Cadiducho. * Read more in https://github.com/Cadiducho/Telegram-Bot-API/blob/master/LICENSE */ - package com.cadiducho.telegrambotapi; import com.cadiducho.telegrambotapi.exception.TelegramException; diff --git a/src/test/java/com/cadiducho/telegrambotapi/TelegramBotTest.java b/src/test/java/com/cadiducho/telegrambotapi/TelegramBotTest.java index 75f5d1c..83a0c74 100644 --- a/src/test/java/com/cadiducho/telegrambotapi/TelegramBotTest.java +++ b/src/test/java/com/cadiducho/telegrambotapi/TelegramBotTest.java @@ -25,7 +25,7 @@ class TelegramBotTest { @BeforeAll static void setUpTokens() { - BOT_TOKEN = "554900770:AAF5Pbtcu9h0FpAn_pPHQqs29PLm71A4PSw"; + BOT_TOKEN = System.getenv("TELEGRAM_BOT_TOKEN"); CHAT_ID = "8609873"; GROUP_ID = "-278714251"; PHOTO_ID = "AgADBAADKK0xG9IykVI0Pe7-q_ueezIrnxoABCR76YWV7M2WDHcEAAEC";